aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llselectmgr.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llselectmgr.cpp')
-rw-r--r--linden/indra/newview/llselectmgr.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 4488a46..1aad3e2 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -4824,11 +4824,21 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud)
4824 if (mSelectedObjects->getNumNodes()) 4824 if (mSelectedObjects->getNumNodes())
4825 { 4825 {
4826 LLUUID inspect_item_id = LLFloaterInspect::getSelectedUUID(); 4826 LLUUID inspect_item_id = LLFloaterInspect::getSelectedUUID();
4827
4827 for (S32 pass = 0; pass < 2; pass++) 4828 for (S32 pass = 0; pass < 2; pass++)
4828 { 4829 {
4830 LLObjectSelection::iterator end_ = mSelectedObjects->end();
4831 S32 num_nodes = mSelectedObjects->getNumNodes() ;
4832 LLObjectSelection::iterator prev_iter = mSelectedObjects->end();
4829 for (LLObjectSelection::iterator iter = mSelectedObjects->begin(); 4833 for (LLObjectSelection::iterator iter = mSelectedObjects->begin();
4830 iter != mSelectedObjects->end(); iter++) 4834 iter != mSelectedObjects->end(); iter++)
4831 { 4835 {
4836 llassert_always(end_ == mSelectedObjects->end()) ;//mSelectedObjects should not grow
4837 llassert_always(prev_iter != iter) ; //iter should move
4838 llassert_always(num_nodes > 0) ; //iter should not circle inside mSelectedObjects.
4839 num_nodes-- ;
4840 prev_iter = iter ;
4841
4832 LLSelectNode* node = *iter; 4842 LLSelectNode* node = *iter;
4833 LLViewerObject* objectp = node->getObject(); 4843 LLViewerObject* objectp = node->getObject();
4834 if (!objectp) 4844 if (!objectp)