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/newview/llviewerobjectlist.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llviewerobjectlist.cpp')

diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 7a6f87e019..2345b4ea06 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -36,7 +36,7 @@
 #include "message.h"
 #include "timing.h"
 #include "llfasttimer.h"
-#include "llglimmediate.h"
+#include "llrender.h"
 
 #include "llviewercontrol.h"
 #include "llface.h"
@@ -685,6 +685,7 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world)
 			idle_iter != idle_list.end(); idle_iter++)
 		{
 			objectp = *idle_iter;
+			llassert_always(objectp) ;
 			if (!objectp->idleUpdate(agent, world, frame_time))
 			{
 				//  If Idle Update returns false, kill object!
-- 
cgit v1.2.3