From ae4a0a22051adb47eef2d36ead316fd276a5ef6a Mon Sep 17 00:00:00 2001
From: David Seikel
Date: Mon, 11 Apr 2011 23:13:02 +1000
Subject: Partial revert of commit a47ebd7864f6dceedd52ceef56a30786f38a00c2
 from upstream.

Not sure what bug they are trying to fix, but this just caused problems.
Just commented out the important part, in case they find another fix.
---
 linden/indra/newview/lltoolmgr.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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

diff --git a/linden/indra/newview/lltoolmgr.cpp b/linden/indra/newview/lltoolmgr.cpp
index 764ca9d..4233a52 100644
--- a/linden/indra/newview/lltoolmgr.cpp
+++ b/linden/indra/newview/lltoolmgr.cpp
@@ -193,14 +193,14 @@ LLTool* LLToolMgr::getCurrentTool()
 	else
 	{
 		// due to window management weirdness we can get here with gToolNull
-		// Don't use keyboard overrides when the edit window doesn't have focus. The chatbar is an unfortunate exception -- MC
-		if (gViewerWindow && gViewerWindow->getUIHasFocus()
-			&& gFloaterTools && !gFloaterTools->hasFocus()
-			&& gChatBar && !gChatBar->getVisible())
-		{
-			cur_tool = mBaseTool;
-		}
-		else
+//		// Don't use keyboard overrides when the edit window doesn't have focus. The chatbar is an unfortunate exception -- MC
+//		if (gViewerWindow && gViewerWindow->getUIHasFocus()
+//			&& gFloaterTools && !gFloaterTools->hasFocus()
+//			&& gChatBar && !gChatBar->getVisible())
+//		{
+//			cur_tool = mBaseTool;
+//		}
+//		else
 		{
 			bool can_override = mBaseTool && (mBaseTool != gToolNull) ;
 								
-- 
cgit v1.1