Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Edit Linked Parts counts and costs display update~

Browse Source 
Show proper impact when editing multiple prims with edit linked parts enabled
Show "Selected prims:" instead of "Selected Objects: 0" when editing linked parts
Show two decimals of impact precision when editing linked parts.
This commit is contained in:
Inusaito Sayori
2014-12-27 13:10:46 -05:00
parent ef32d0d321
commit 7749f8a99d
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llfloatertools.cpp
View File

@@ -545,7 +545,8 @@ void LLFloaterTools::refresh()
// Added in Link Num value -HgB // Added in Link Num value -HgB
S32 prim_count = LLSelectMgr::getInstance()->getEditSelection()->getObjectCount(); S32 prim_count = LLSelectMgr::getInstance()->getEditSelection()->getObjectCount();
std::string value_string; std::string value_string;
if ((prim_count == 1) && gSavedSettings.getBOOL("EditLinkedParts")) //Selecting a single prim in "Edit Linked" mode, show link number bool edit_linked(gSavedSettings.getBOOL("EditLinkedParts"));
if (edit_linked && prim_count == 1) //Selecting a single prim in "Edit Linked" mode, show link number
{ {
link_cost = LLSelectMgr::getInstance()->getSelection()->getSelectedObjectCost(); link_cost = LLSelectMgr::getInstance()->getSelection()->getSelectedObjectCost();
childSetTextArg("link_num_obj_count", "[DESC]", std::string("Link number:")); childSetTextArg("link_num_obj_count", "[DESC]", std::string("Link number:"));
@@ -573,6 +574,12 @@ void LLFloaterTools::refresh()
} }
} }
} }
else if (edit_linked)
{
childSetTextArg("link_num_obj_count", "[DESC]", std::string("Selected prims:"));
LLResMgr::getInstance()->getIntegerString(value_string, prim_count);
link_cost = LLSelectMgr::getInstance()->getSelection()->getSelectedObjectCost();
}
else else
{ {
childSetTextArg("link_num_obj_count", "[DESC]", std::string("Selected objects:")); childSetTextArg("link_num_obj_count", "[DESC]", std::string("Selected objects:"));
@@ -606,7 +613,7 @@ void LLFloaterTools::refresh()
LLStringUtil::format_map_t selection_args; LLStringUtil::format_map_t selection_args;
selection_args["OBJ_COUNT"] = llformat("%.1d", prim_count); selection_args["OBJ_COUNT"] = llformat("%.1d", prim_count);
selection_args["LAND_IMPACT"] = llformat("%.1d", (S32)link_cost); selection_args["LAND_IMPACT"] = llformat(edit_linked ? "%.2f" : "%.0f", link_cost);
std::ostringstream selection_info; std::ostringstream selection_info;