Partial revert of a47ebd78. This caused issues with selection and alt-camming, and fixes for them seemed to only create more edge cases rather than solve them. If anyone finds a good way to differentiate when users can use keyboard vs. ui selection, go for it

1 files changed, 4 insertions, 15 deletions

diff --git a/linden/indra/newview/lltoolmgr.cpp b/linden/indra/newview/lltoolmgr.cpp
index 764ca9d..675412d 100644
--- a/linden/indra/newview/lltoolmgr.cpp
+++ b/linden/indra/newview/lltoolmgr.cpp
@@ -193,22 +193,11 @@ 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
-                {
-                        bool can_override = mBaseTool && (mBaseTool != gToolNull) ;
-                                                                
-                        mOverrideTool = can_override ? mBaseTool->getOverrideTool(override_mask) : NULL;
+                bool can_override = mBaseTool && (mBaseTool != gToolNull) ;                                     
+                mOverrideTool = can_override ? mBaseTool->getOverrideTool(override_mask) : NULL;
 
-                        // use keyboard-override tool if available otherwise drop back to base tool
-                        cur_tool = mOverrideTool ? mOverrideTool : mBaseTool;
-                }
+                // use keyboard-override tool if available otherwise drop back to base tool
+                cur_tool = mOverrideTool ? mOverrideTool : mBaseTool;
         }
 
         LLTool* prev_tool = mSelectedTool;