diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-24 14:22:08 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-24 14:22:08 -0500 |
commit | de83bd5c6b1e103993ba74321d600f1c413785ce (patch) | |
tree | 7a93bec47e33227541abda9ea80b7b094c8be549 /indra/newview/llselectmgr.h | |
parent | f57aa3e83f1b4286b1d6b5cc8bca20fb924cb002 (diff) | |
parent | 295536ae98cb88bfa551ac73ae2e19a8c2ddfc88 (diff) |
merge changes for beta fixes
Diffstat (limited to 'indra/newview/llselectmgr.h')
-rw-r--r-- | indra/newview/llselectmgr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h index 7478ed5f9a..65a9a493f6 100644 --- a/indra/newview/llselectmgr.h +++ b/indra/newview/llselectmgr.h @@ -235,7 +235,7 @@ public: { bool operator()(LLSelectNode* node); }; - typedef boost::filter_iterator<is_root, list_t::iterator > valid_root_iterator; + typedef boost::filter_iterator<is_valid_root, list_t::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()); } |