aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltoolmgr.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/lltoolmgr.cpp')
-rw-r--r--linden/indra/newview/lltoolmgr.cpp2
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