summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2017-02-28 18:34:18 +0200
committerandreykproductengine <akleshchev@productengine.com>2017-02-28 18:34:18 +0200
commit9bd3a99f20ff6e73f5ea2245a21a94c5882ca673 (patch)
tree2410a2ab931bf23d7744534c37a6c835e974249c /indra/newview
parentedade660ecfeb8b5cc8eb505e6c4f79f8caa96d7 (diff)
MAINT-908 Build Tool has wrong screen priority and can stay behind other floaters when called
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewermenu.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index a92ecd2036..605d1a04e6 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -8402,6 +8402,15 @@ class LLToolsSelectTool : public view_listener_t
{
LLToolMgr::getInstance()->getCurrentToolset()->selectToolByIndex(5);
}
+
+ // Note: if floater is not visible LLViewerWindow::updateLayout() will
+ // attempt to open it, but it won't bring it to front or de-minimize.
+ if (gFloaterTools && (gFloaterTools->isMinimized() || !gFloaterTools->isShown() || !gFloaterTools->isFrontmost()))
+ {
+ gFloaterTools->setMinimized(FALSE);
+ gFloaterTools->openFloater();
+ gFloaterTools->setVisibleAndFrontmost(TRUE);
+ }
return true;
}
};