From ad332810078a0bbb8fa08fcbfdf3d756de6914f6 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Fri, 6 Jun 2008 22:43:38 +0000
Subject: QAR-650 - Viewer RC 9 merge -> release (post cmake) merge
 release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release

---
 indra/llui/llscrolllistctrl.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/llui/llscrolllistctrl.cpp')

diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index c923f6b116..b4a2ed874a 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -42,7 +42,7 @@
 #include "llcheckboxctrl.h"
 #include "llclipboard.h"
 #include "llfocusmgr.h"
-#include "llglimmediate.h"
+#include "llrender.h"
 #include "llresmgr.h"
 #include "llscrollbar.h"
 #include "llstring.h"
@@ -1110,6 +1110,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() )
-- 
cgit v1.2.3