1 files changed, 2 insertions, 1 deletions

diff --git a/linden/indra/newview/lltoolfocus.cpp b/linden/indra/newview/lltoolfocus.cpp
index c526e6e..e5a3ed5 100644
--- a/linden/indra/newview/lltoolfocus.cpp
+++ b/linden/indra/newview/lltoolfocus.cpp
@@ -57,6 +57,7 @@
 #include "llmorphview.h"
 
 // Globals
+BOOL gCameraBtnZoom = TRUE;
 BOOL gCameraBtnOrbit = FALSE;
 BOOL gCameraBtnPan = FALSE;
 
@@ -403,7 +404,7 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
                         }
                         lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolPan" << llendl;
                 }
-                else
+                else if (gCameraBtnZoom)
                 {
                         // Zoom tool
                         if (hasMouseCapture())