From 291d99bc66c4c2b8009ba723a43e2e97d24313f9 Mon Sep 17 00:00:00 2001
From: Tess Chu <tess@lindenlab.com>
Date: Thu, 15 Nov 2007 19:22:19 +0000
Subject: svn merge -r73220:73877
 svn+ssh://svn/svn/linden/branches/viewer-auth-6

---
 indra/newview/lltoolpie.cpp | 2 ++
 1 file changed, 2 insertions(+)

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

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);
-- 
cgit v1.2.3