From c331bcf1845f5af63d046bf7c4cf50a121411ce8 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sun, 20 Nov 2016 12:35:13 +0100 Subject: [PATCH] FIRE-20387: Editing HUD attachment shows [CAPACITY_STRING] in tools floater --- indra/newview/llfloatertools.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index 13f835d9ed..580521d321 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -664,7 +664,18 @@ void LLFloaterTools::refresh() if (selected_object) { // Select a parcel at the currently selected object's position. - LLViewerParcelMgr::getInstance()->selectParcelAt(selected_object->getPositionGlobal()); + // FIRE-20387: Editing HUD attachment shows [CAPACITY_STRING] in tools floater + //LLViewerParcelMgr::getInstance()->selectParcelAt(selected_object->getPositionGlobal()); + if (!selected_object->isAttachment()) + { + LLViewerParcelMgr::getInstance()->selectParcelAt(selected_object->getPositionGlobal()); + } + else + { + const LLStringExplicit empty_str(""); + childSetTextArg("remaining_capacity", "[CAPACITY_STRING]", empty_str); + } + // } else {