aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorAleric Inglewood2010-09-30 15:15:54 +0200
committerAleric Inglewood2010-09-30 15:15:54 +0200
commitf7ae9b80b39003e862f5e65a160d8d1fbbdc0532 (patch)
tree68b371c8abd0aea5dbdb4672ef11e2ce2019b4b4 /linden/indra
parentRED-573: FindTut.cmake is missing: tut.h is not searched for. (diff)
downloadmeta-impy-f7ae9b80b39003e862f5e65a160d8d1fbbdc0532.zip
meta-impy-f7ae9b80b39003e862f5e65a160d8d1fbbdc0532.tar.gz
meta-impy-f7ae9b80b39003e862f5e65a160d8d1fbbdc0532.tar.bz2
meta-impy-f7ae9b80b39003e862f5e65a160d8d1fbbdc0532.tar.xz
RED-575: VWR-13040: LLObjectSelection::valid_root_begin() is really the same as LLObjectSelection::root_begin()
See http://redmine.imprudenceviewer.org/issues/575
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/newview/llselectmgr.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llselectmgr.h b/linden/indra/newview/llselectmgr.h
index 6278049..c19d33d 100644
--- a/linden/indra/newview/llselectmgr.h
+++ b/linden/indra/newview/llselectmgr.h
@@ -252,7 +252,7 @@ public:
252 return (object != NULL) && node->mValid && !node->mIndividualSelection && (object->isRootEdit() || object->isJointChild()); 252 return (object != NULL) && node->mValid && !node->mIndividualSelection && (object->isRootEdit() || object->isJointChild());
253 } 253 }
254 }; 254 };
255 typedef boost::filter_iterator<is_root, list_t::iterator > valid_root_iterator; 255 typedef boost::filter_iterator<is_valid_root, list_t::iterator > valid_root_iterator;
256 valid_root_iterator valid_root_begin() { return valid_root_iterator(mList.begin(), mList.end()); } 256 valid_root_iterator valid_root_begin() { return valid_root_iterator(mList.begin(), mList.end()); }
257 valid_root_iterator valid_root_end() { return valid_root_iterator(mList.end(), mList.end()); } 257 valid_root_iterator valid_root_end() { return valid_root_iterator(mList.end(), mList.end()); }
258 258