From 41f3080d93c0a6efdf415981a2f168bbc55dd73a Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Tue, 28 Jun 2011 15:36:26 -0400
Subject: [PATCH] SH-1917 SH-1935 FIX PE cost is not always shown, includes
unnecessary digits
Reformatted line showing prim equiv values, formatted to an integer,
removed old Render Cost display, and updated label of new display.
---
indra/newview/llfloatertools.cpp | 24 +++++++++++--------
.../skins/default/xui/en/floater_tools.xml | 18 +++-----------
2 files changed, 17 insertions(+), 25 deletions(-)
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index 3e98cff9e60..1b6feddb6c6 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -455,27 +455,31 @@ void LLFloaterTools::refresh()
S32 prim_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount();
S32 link_count = LLSelectMgr::getInstance()->getSelection()->getRootObjectCount();
- LLStringUtil::format_map_t args;
- args["OBJ_COUNT"] = llformat("%.1d", link_count);
- args["PRIM_COUNT"] = llformat("%.1d", prim_count);
+ LLStringUtil::format_map_t selection_args;
+ selection_args["OBJ_COUNT"] = llformat("%.1d", link_count);
+ selection_args["PRIM_COUNT"] = llformat("%.1d", prim_count);
std::ostringstream selection_info;
- selection_info << getString("status_selectcount", args);
- bool show_prim_equiv = (link_cost != prim_count) && link_cost;
bool show_adv_weight = gSavedSettings.getBOOL("ShowAdvancedBuilderOptions");
bool show_mesh_cost = gMeshRepo.meshRezEnabled();
- if (show_prim_equiv && show_mesh_cost)
+ if (show_mesh_cost)
{
- selection_info << ": ";
- args["SEL_WEIGHT"] = llformat("%.1f", link_cost);
- selection_info << getString("status_selectprimequiv", args);
+ LLStringUtil::format_map_t prim_equiv_args;
+ prim_equiv_args["SEL_WEIGHT"] = llformat("%.1d", (S32)link_cost);
+ selection_args["PE_STRING"] = getString("status_selectprimequiv", prim_equiv_args);
}
+ else
+ {
+ selection_args["PE_STRING"] = "";
+ }
+
+ selection_info << getString("status_selectcount", selection_args);
if (show_adv_weight)
{
- show_prim_equiv ? (selection_info << ",") : (selection_info << ".");
+ selection_info << ",";
childSetTextArg("selection_weight", "[PHYS_WEIGHT]", llformat("%.1f", link_phys_cost));
childSetTextArg("selection_weight", "[DISP_WEIGHT]", llformat("%.1d", calcRenderCost()));
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index aad94f5b473..10db8719170 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -48,11 +48,11 @@
</floater.string>
<floater.string
name="status_selectcount">
- [OBJ_COUNT] objects ( [PRIM_COUNT] prims ) selected
+ [OBJ_COUNT] objects ( [PRIM_COUNT] prims[PE_STRING] ) selected
</floater.string>
<floater.string
name="status_selectprimequiv">
- PE weight [SEL_WEIGHT]
+ , [SEL_WEIGHT] prim equivs
</floater.string>
<button
follows="left|top"
@@ -271,18 +271,6 @@
<button.commit_callback
function="BuildTool.UnlinkObjects"/>
</button>
- <text
- text_color="LtGray_50"
- follows="top|left"
- halign="left"
- left_pad="3"
- name="RenderingCost"
- tool_tip="Shows the rendering cost calculated for this object"
- top_delta="11"
- type="string"
- width="100">
- þ: [COUNT]
- </text>
<check_box
control_name="ScaleUniform"
height="19"
@@ -754,7 +742,7 @@
top_pad="0"
visible="false"
width="280">
- Physics weight [PHYS_WEIGHT], Display weight [DISP_WEIGHT].
+ Physics weight [PHYS_WEIGHT], Render Cost [DISP_WEIGHT].
</text>
<!-- <text -->
<!-- text_color="LtGray_50" -->
--
GitLab