From 583558dad8bf03e9d1da997a994d3bc422d1fe11 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Thu, 6 Jun 2019 20:05:51 +0300 Subject: SL-11378 Edit tool floater displays with issues if opened mid-drag --- indra/newview/llfloatertools.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'indra') diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index c2c15ee12b..0429749e11 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -850,6 +850,18 @@ void LLFloaterTools::onOpen(const LLSD& key) { mTab->selectTabByName(panel); } + + LLTool* tool = LLToolMgr::getInstance()->getCurrentTool(); + if (tool == LLToolCompInspect::getInstance() + || tool == LLToolDragAndDrop::getInstance()) + { + // Something called floater up while it was supressed (during drag n drop, inspect), + // so it won't be getting any layout or visibility updates, update once + // further updates will come from updateLayout() + LLCoordGL select_center_screen; + MASK mask = gKeyboard->currentMask(TRUE); + updatePopup(select_center_screen, mask); + } //gMenuBarView->setItemVisible("BuildTools", TRUE); } -- cgit v1.2.3