diff -r b0bd26c5638a -r a5dc86c16bd1 doc/contributions.txt --- a/doc/contributions.txt Thu Dec 30 13:11:44 2010 -0500 +++ b/doc/contributions.txt Wed Dec 15 17:44:27 2010 +0100 @@ -72,6 +72,7 @@ VWR-10837 VWR-12691 VWR-12984 + VWR-13040 VWR-13996 VWR-14426 VWR-24247 diff -r b0bd26c5638a -r a5dc86c16bd1 indra/newview/llselectmgr.h --- a/indra/newview/llselectmgr.h Thu Dec 30 13:11:44 2010 -0500 +++ b/indra/newview/llselectmgr.h Wed Dec 15 17:44:27 2010 +0100 @@ -235,7 +235,7 @@ { bool operator()(LLSelectNode* node); }; - typedef boost::filter_iterator valid_root_iterator; + typedef boost::filter_iterator valid_root_iterator; valid_root_iterator valid_root_begin() { return valid_root_iterator(mList.begin(), mList.end()); } valid_root_iterator valid_root_end() { return valid_root_iterator(mList.end(), mList.end()); }