From edc0e31bc29f77a821f5ff8a0cb6cf9ba982eb7d Mon Sep 17 00:00:00 2001 From: Wolfpup Lowenhar Date: Mon, 20 Jun 2011 11:55:46 -0400 Subject: STORM-1393 : Correction for loss of object/prim counts in the Build floater for non-mesh objects. --- indra/newview/llfloatertools.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'indra/newview/llfloatertools.cpp') diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index 0d798afdcc..33b7777d2e 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -424,8 +424,7 @@ void LLFloaterTools::refresh() // Refresh object and prim count labels LLLocale locale(LLLocale::USER_LOCALE); -#if 0 - if (gMeshRepo.meshRezEnabled()) + if (!gMeshRepo.meshRezEnabled()) { std::string obj_count_string; LLResMgr::getInstance()->getIntegerString(obj_count_string, LLSelectMgr::getInstance()->getSelection()->getRootObjectCount()); @@ -449,7 +448,6 @@ void LLFloaterTools::refresh() getChildView("RenderingCost")->setEnabled(have_selection && sShowObjectCost); } else -#endif { // Get the number of objects selected std::string root_object_count_string; -- cgit v1.2.3 From 41f3080d93c0a6efdf415981a2f168bbc55dd73a Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Tue, 28 Jun 2011 15:36:26 -0400 Subject: 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 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'indra/newview/llfloatertools.cpp') diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index 3e98cff9e6..1b6feddb6c 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())); -- cgit v1.2.3