diff options
| -rw-r--r-- | linden/indra/newview/lltoolmgr.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
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() | |||
| 193 | else | 193 | else |
| 194 | { | 194 | { |
| 195 | // due to window management weirdness we can get here with gToolNull | 195 | // due to window management weirdness we can get here with gToolNull |
| 196 | // Don't use keyboard overrides when the edit window doesn't have focus. The chatbar is an unfortunate exception -- MC | 196 | // // Don't use keyboard overrides when the edit window doesn't have focus. The chatbar is an unfortunate exception -- MC |
| 197 | if (gViewerWindow && gViewerWindow->getUIHasFocus() | 197 | // if (gViewerWindow && gViewerWindow->getUIHasFocus() |
| 198 | && gFloaterTools && !gFloaterTools->hasFocus() | 198 | // && gFloaterTools && !gFloaterTools->hasFocus() |
| 199 | && gChatBar && !gChatBar->getVisible()) | 199 | // && gChatBar && !gChatBar->getVisible()) |
| 200 | { | 200 | // { |
| 201 | cur_tool = mBaseTool; | 201 | // cur_tool = mBaseTool; |
| 202 | } | 202 | // } |
| 203 | else | 203 | // else |
| 204 | { | 204 | { |
| 205 | bool can_override = mBaseTool && (mBaseTool != gToolNull) ; | 205 | bool can_override = mBaseTool && (mBaseTool != gToolNull) ; |
| 206 | 206 | ||