Second Life viewer sources 1.20.7

1 files changed, 3 insertions, 5 deletions

diff --git a/linden/indra/llui/llscrolllistctrl.cpp b/linden/indra/llui/llscrolllistctrl.cpp
index 32c4e82..9693df4 100644
--- a/linden/indra/llui/llscrolllistctrl.cpp
+++ b/linden/indra/llui/llscrolllistctrl.cpp
@@ -43,7 +43,7 @@
 #include "llclipboard.h"
 #include "llfocusmgr.h"
 #include "llgl.h"
-#include "llglimmediate.h"
+#include "llrender.h"
 #include "llglheaders.h"
 #include "llresmgr.h"
 #include "llscrollbar.h"
@@ -1117,9 +1117,7 @@ BOOL LLScrollListCtrl::selectItemRange( S32 first_index, S32 last_index )
                         if( itemp->getEnabled() )
                         {
                                 selectItem(itemp, FALSE);
-                                success = TRUE;
-                                if (!success)
-                                        mOriginalSelection = first_index;
+                                success = TRUE;                         
                         }
                 }
                 else
@@ -1198,7 +1196,7 @@ void LLScrollListCtrl::deleteItems(const LLSD& sd)
                                 mLastSelected = NULL;
                         }
                         delete itemp;
-                        mItemList.erase(iter++);
+                        iter = mItemList.erase(iter);
                 }
                 else
                 {