From 2a4dea528f670b9bb1f77ef27a8a1dd16603d114 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:45:50 -0500
Subject: Second Life viewer sources 1.20.7

---
 linden/indra/newview/lltoolfocus.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'linden/indra/newview/lltoolfocus.cpp')

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())
-- 
cgit v1.1