summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2014-07-16 17:08:11 +0300
committerandreykproductengine <akleshchev@productengine.com>2014-07-16 17:08:11 +0300
commit351621d87347c3c436ea633045fc3f712fbeee5b (patch)
tree8e1125d6845c282c24f2eff9f1cca412ebaa07af
parent5850f5c3bb90d07404e916ae2b67dda839b6119b (diff)
MAINT-2205 FIXED Pressing delete in script window deletes selected object
Focus was not properly released
-rwxr-xr-xindra/newview/lltoolpie.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 8191958dd4..eec9760d2d 100755
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -1700,6 +1700,12 @@ BOOL LLToolPie::handleRightClickPick()
}
}
+ // non UI object - put focus back "in world"
+ if (gFocusMgr.getKeyboardFocus())
+ {
+ gFocusMgr.setKeyboardFocus(NULL);
+ }
+
LLTool::handleRightMouseDown(x, y, mask);
// We handled the event.
return TRUE;