summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolpie.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2010-02-12 13:46:21 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2010-02-12 13:46:21 -0500
commitdc8a9dc57d41723338a0881a29c5652924977ccf (patch)
tree272cd5624749a1ff720ad9674412060c33978cdb /indra/newview/lltoolpie.cpp
parent1e76fc2b1f4e735105f2d45d73ea5a92dbad4e05 (diff)
parent6e0ebfe18c431465f6d1bc52e079c7a745419de5 (diff)
merge
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
-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.