diff options
| author | Mark Palange <palange@lindenlab.com> | 2008-12-23 19:39:58 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2008-12-23 19:39:58 +0000 |
| commit | fb793870fe95f1951d7c30ea6068e187b9dededd (patch) | |
| tree | 6d11632353ff4fb07133625ec5031b135b1e2882 /indra/newview/llviewerobjectlist.cpp | |
| parent | d182b9fb82b9c63f41d81bc80dbbfe627475facf (diff) | |
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
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
| -rw-r--r-- | indra/newview/llviewerobjectlist.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
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); + } + } } } |