diff options
| author | Wolfpup Lowenhar <wolfpup67@earthlink.net> | 2011-06-20 11:55:46 -0400 |
|---|---|---|
| committer | Wolfpup Lowenhar <wolfpup67@earthlink.net> | 2011-06-20 11:55:46 -0400 |
| commit | edc0e31bc29f77a821f5ff8a0cb6cf9ba982eb7d (patch) | |
| tree | 09d5f2c6c48a2de5c6bef0ad59b6684495f8afe9 | |
| parent | 7f6d49df43c660b9f5632ffb8a30f90ee718cac0 (diff) | |
STORM-1393 : Correction for loss of object/prim counts in the Build floater for
non-mesh objects.
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llfloatertools.cpp | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index b744f4db3e..97f4bf516a 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 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; |