summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatertools.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-05-15 02:45:58 -0500
committerDave Parks <davep@lindenlab.com>2010-05-15 02:45:58 -0500
commit246dd9c168550bfe4b1b71bba75f5af9456e86dd (patch)
treeb95e0fa776c7a6d8d6cf7fb652a877011cd6f518 /indra/newview/llfloatertools.cpp
parent8be6ad300a320b8a9debbd3abbf4b5c252db70a9 (diff)
Highlight for object cost and proper retrieval/display of prim object cost and linkset cost.
Diffstat (limited to 'indra/newview/llfloatertools.cpp')
-rw-r--r--indra/newview/llfloatertools.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index a8172bbfae..30d2a02b5b 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -419,12 +419,12 @@ void LLFloaterTools::refresh()
// Refresh object and prim count labels
LLLocale locale(LLLocale::USER_LOCALE);
- std::string obj_count_string;
- LLResMgr::getInstance()->getIntegerString(obj_count_string, LLSelectMgr::getInstance()->getSelection()->getRootObjectCount());
- childSetTextArg("obj_count", "[COUNT]", obj_count_string);
- std::string prim_count_string;
- LLResMgr::getInstance()->getIntegerString(prim_count_string, LLSelectMgr::getInstance()->getSelection()->getObjectCount(TRUE));
- childSetTextArg("prim_count", "[COUNT]", prim_count_string);
+
+ F32 obj_cost = LLSelectMgr::getInstance()->getSelection()->getSelectedObjectCost();
+ F32 link_cost = LLSelectMgr::getInstance()->getSelection()->getSelectedLinksetCost();
+
+ childSetTextArg("obj_count", "[COUNT]", llformat("%.1f", obj_cost));
+ childSetTextArg("prim_count", "[COUNT]", llformat("%.1f", link_cost));
// calculate selection rendering cost
if (sShowObjectCost)