From 9ef117b1fd38dd4e737f8f585f4b1baf438f5788 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Thu, 28 Mar 2019 16:03:13 +0200 Subject: SL-10815 FIXED The weight of an object is displayed in the 'Land tool' floater --- indra/newview/llfloatertools.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'indra/newview/llfloatertools.cpp') diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index ee4fdbe9a5..c2c15ee12b 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -514,11 +514,6 @@ void LLFloaterTools::refresh() selection_info << getString("status_selectcount", selection_args); getChild("selection_count")->setText(selection_info.str()); - - bool have_selection = !LLSelectMgr::getInstance()->getSelection()->isEmpty(); - childSetVisible("selection_count", have_selection); - childSetVisible("remaining_capacity", have_selection); - childSetVisible("selection_empty", !have_selection); } -- cgit v1.2.3 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/newview/llfloatertools.cpp') 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