summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolpie.cpp
diff options
context:
space:
mode:
authorTess Chu <tess@lindenlab.com>2007-11-20 02:53:43 +0000
committerTess Chu <tess@lindenlab.com>2007-11-20 02:53:43 +0000
commit2f6c7606241acdf800a2c079b359e7a1db360954 (patch)
treeadb6e6e34f9c3df1e2252b2f763ae20970c0e2d4 /indra/newview/lltoolpie.cpp
parent813b140d0767146b17acf4ad2fb96fbd5a347c34 (diff)
svn merge -r 73926:74098 svn+ssh://svn/svn/linden/branches/viewer-auth-7
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
-rw-r--r--indra/newview/lltoolpie.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 166209d582..fa8213d662 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -85,6 +85,8 @@ LLToolPie::LLToolPie()
BOOL LLToolPie::handleMouseDown(S32 x, S32 y, MASK mask)
{
+ if (!gCamera) return FALSE;
+
//left mouse down always picks transparent
gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, leftMouseCallback,
TRUE, TRUE);