1 files changed, 7 insertions, 1 deletions

diff --git a/linden/indra/newview/lltool.cpp b/linden/indra/newview/lltool.cpp
index cb0d3b1..99dbe31 100644
--- a/linden/indra/newview/lltool.cpp
+++ b/linden/indra/newview/lltool.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -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();