Second Life viewer sources 1.20.9

2 files changed, 3 insertions, 1 deletions

diff --git a/linden/indra/llui/llscrolllistctrl.cpp b/linden/indra/llui/llscrolllistctrl.cpp
index 9693df4..41b50c2 100644
--- a/linden/indra/llui/llscrolllistctrl.cpp
+++ b/linden/indra/llui/llscrolllistctrl.cpp
@@ -1112,6 +1112,8 @@ BOOL LLScrollListCtrl::selectItemRange( S32 first_index, S32 last_index )
         for (item_list::iterator iter = mItemList.begin(); iter != mItemList.end(); iter++)
         {
                 LLScrollListItem *itemp = *iter;
+        
+                llassert_always(itemp) ;
                 if( index >= first_index && index <= last_index )
                 {
                         if( itemp->getEnabled() )
diff --git a/linden/indra/llui/llstyle.cpp b/linden/indra/llui/llstyle.cpp
index 7c46114..58cf200 100644
--- a/linden/indra/llui/llstyle.cpp
+++ b/linden/indra/llui/llstyle.cpp
@@ -102,7 +102,7 @@ LLStyle &LLStyle::operator=(const LLStyle &rhs)
                 mItalic = rhs.mItalic;
                 mBold = rhs.mBold;
                 mUnderline = rhs.mUnderline;
-                mDropShadow = rhs.mUnderline;
+                mDropShadow = rhs.mDropShadow;
                 mIsEmbeddedItem = rhs.mIsEmbeddedItem;
         }