QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release

1 files changed, 6 insertions, 0 deletions

diff --git a/indra/newview/lltool.cpp b/indra/newview/lltool.cpp
index 11e90e9c84..2959e3a370 100644
--- a/indra/newview/lltool.cpp
+++ b/indra/newview/lltool.cpp
@@ -42,6 +42,7 @@
 #include "lltoolfocus.h"
 #include "llfocusmgr.h"
 #include "llagent.h"
+#include "llviewerjoystick.h"
 
 extern BOOL gDebugClicks;
 
@@ -160,6 +161,11 @@ BOOL LLTool::handleKey(KEY key, MASK mask)
 
 LLTool* LLTool::getOverrideTool(MASK mask)
 {
+	// NOTE: if in flycam mode, ALT-ZOOM camera should be disabled
+	if (LLViewerJoystick::getInstance()->getOverrideCamera())
+	{
+		return NULL;
+	}
 	if (mask & MASK_ALT)
 	{
 		return LLToolCamera::getInstance();