summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-11 12:52:22 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-11 12:52:22 +0000
commit8d3d389fc76d4bf4bf7a27c7ee1bdefc2399137b (patch)
treece630f308d17c4d6f34f961104e3526fdd4e8e2e /indra/newview
parent9919e6f3394699594644ddc7555a113aed2d12eb (diff)
CID-73
Checker: FORWARD_NULL Function: LLToolPie::pickRightMouseDownCallback() File: /indra/newview/lltoolpie.cpp
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/lltoolpie.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index bf1e307d71..fdf9e1df2e 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -1485,6 +1485,12 @@ BOOL LLToolPie::pickRightMouseDownCallback()
while( object && object->isAttachment())
{
object = (LLViewerObject*)object->getParent();
+ llassert(object);
+ }
+
+ if (!object)
+ {
+ return TRUE; // unexpected, but escape
}
// Object is an avatar, so check for mute by id.