From fb793870fe95f1951d7c30ea6068e187b9dededd Mon Sep 17 00:00:00 2001
From: Mark Palange <palange@lindenlab.com>
Date: Tue, 23 Dec 2008 19:39:58 +0000
Subject: QAR-1142 merging 1.22 RC0-RC4 changes. svn merge -c 106471
 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge

---
 indra/newview/llviewerobjectlist.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 1fca77ec50..ef657a17cc 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -827,8 +827,15 @@ void LLViewerObjectList::removeDrawable(LLDrawable* drawablep)
 
 	for (S32 i = 0; i < drawablep->getNumFaces(); i++)
 	{
-		LLViewerObject* objectp = drawablep->getFace(i)->getViewerObject();
-		mSelectPickList.erase(objectp);
+		LLFace* facep = drawablep->getFace(i) ;
+		if(facep)
+		{
+			   LLViewerObject* objectp = facep->getViewerObject();
+			   if(objectp)
+			   {
+					   mSelectPickList.erase(objectp);
+			   }
+		}
 	}
 }
 
-- 
cgit v1.2.3