Second Life viewer sources 1.20.9

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)
         if (mSelectedObjects->getNumNodes())
         {
                 LLUUID inspect_item_id = LLFloaterInspect::getSelectedUUID();
+                
                 for (S32 pass = 0; pass < 2; pass++)
                 {
+                        LLObjectSelection::iterator end_ = mSelectedObjects->end();             
+                        S32 num_nodes = mSelectedObjects->getNumNodes() ;
+                        LLObjectSelection::iterator prev_iter = mSelectedObjects->end();                
                         for (LLObjectSelection::iterator iter = mSelectedObjects->begin();
                                  iter != mSelectedObjects->end(); iter++)
                         {
+                                llassert_always(end_ == mSelectedObjects->end()) ;//mSelectedObjects should not grow
+                                llassert_always(prev_iter != iter) ; //iter should move
+                                llassert_always(num_nodes > 0) ; //iter should not circle inside mSelectedObjects.
+                                num_nodes-- ;
+                                prev_iter = iter ;
+
                                 LLSelectNode* node = *iter;
                                 LLViewerObject* objectp = node->getObject();
                                 if (!objectp)