From edc0e31bc29f77a821f5ff8a0cb6cf9ba982eb7d Mon Sep 17 00:00:00 2001
From: Wolfpup Lowenhar <wolfpup67@earthlink.net>
Date: Mon, 20 Jun 2011 11:55:46 -0400
Subject: [PATCH] STORM-1393 : Correction for loss of object/prim counts in the
Build floater for non-mesh objects.
---
doc/contributions.txt | 1 +
indra/newview/llfloatertools.cpp | 4 +---
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index b744f4db3e1..97f4bf516a6 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -910,6 +910,7 @@ WolfPup Lowenhar
STORM-825
STORM-859
STORM-1098
+ STORM-1393
VWR-20741
VWR-20933
Zai Lynch
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index 0d798afdcc7..33b7777d2ef 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;
--
GitLab