diff options
| author | David Seikel | 2011-04-11 23:13:02 +1000 |
|---|---|---|
| committer | David Seikel | 2011-04-11 23:13:02 +1000 |
| commit | ae4a0a22051adb47eef2d36ead316fd276a5ef6a (patch) | |
| tree | ea46870b23e505102a24621306bebde88f998f31 /linden | |
| parent | Shift the console up by a magic number to not cover the login panel. (diff) | |
| download | meta-impy-ae4a0a22051adb47eef2d36ead316fd276a5ef6a.zip meta-impy-ae4a0a22051adb47eef2d36ead316fd276a5ef6a.tar.gz meta-impy-ae4a0a22051adb47eef2d36ead316fd276a5ef6a.tar.bz2 meta-impy-ae4a0a22051adb47eef2d36ead316fd276a5ef6a.tar.xz | |
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.
Diffstat (limited to '')
| -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 | ||