Second Life viewer sources 1.20.10

1 files changed, 8 insertions, 3 deletions

diff --git a/linden/indra/llui/llscrolllistctrl.cpp b/linden/indra/llui/llscrolllistctrl.cpp
index 41b50c2..307d045 100644
--- a/linden/indra/llui/llscrolllistctrl.cpp
+++ b/linden/indra/llui/llscrolllistctrl.cpp
@@ -1109,11 +1109,15 @@ BOOL LLScrollListCtrl::selectItemRange( S32 first_index, S32 last_index )
 
         BOOL success = FALSE;
         S32 index = 0;
-        for (item_list::iterator iter = mItemList.begin(); iter != mItemList.end(); iter++)
+        for (item_list::iterator iter = mItemList.begin(); iter != mItemList.end(); )
         {
                 LLScrollListItem *itemp = *iter;
-        
-                llassert_always(itemp) ;
+                if(!itemp)
+                {
+                        iter = mItemList.erase(iter);
+                        continue ;
+                }
+                
                 if( index >= first_index && index <= last_index )
                 {
                         if( itemp->getEnabled() )
@@ -1127,6 +1131,7 @@ BOOL LLScrollListCtrl::selectItemRange( S32 first_index, S32 last_index )
                         deselectItem(itemp);
                 }
                 index++;
+                iter++ ;
         }
 
         if (mCommitOnSelectionChange)