diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-01 07:22:32 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-01 07:22:32 -0500 |
| commit | f0074f1002f36ad680ae04daf3f5e026dca31d54 (patch) | |
| tree | e55cad847d3dbd156b8386272d0778bdf952c33a /indra/newview/llselectmgr.h | |
| parent | 1aa01ad67fbe15ed43d8bb0bc7fb34a076a484b0 (diff) | |
| parent | ed308d15bf2f88f91687411cd92f6cc55b1e75b4 (diff) | |
merge changes back from beta branch
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()); } |