diff options
| author | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
| commit | c7f06e9e63a54874696fe89e2ef24c809bef51f3 (patch) | |
| tree | 3eb207f344435fbeb82b142000980416d50690cd /linden/indra/newview/lltoolmgr.cpp | |
| parent | More Windlight refactoring, including moving the new stuff back to lightshare.c. (diff) | |
| parent | Fix Align tool conflicts with Edit Linked Parts - http://redmine.kokuaviewer.... (diff) | |
| download | meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.zip meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.gz meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.bz2 meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.xz | |
Merge remote-tracking branch 'origin/next' into WL-refactor
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/lltoolmgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/lltoolmgr.cpp b/linden/indra/newview/lltoolmgr.cpp index 675412d..9e7bc5c 100644 --- a/linden/indra/newview/lltoolmgr.cpp +++ b/linden/indra/newview/lltoolmgr.cpp | |||
| @@ -193,7 +193,7 @@ 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 | bool can_override = mBaseTool && (mBaseTool != gToolNull) ; | 196 | bool can_override = mBaseTool && (mBaseTool != gToolNull); |
| 197 | mOverrideTool = can_override ? mBaseTool->getOverrideTool(override_mask) : NULL; | 197 | mOverrideTool = can_override ? mBaseTool->getOverrideTool(override_mask) : NULL; |
| 198 | 198 | ||
| 199 | // use keyboard-override tool if available otherwise drop back to base tool | 199 | // use keyboard-override tool if available otherwise drop back to base tool |