diff options
| -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 2c140bcaed..dc5bf53c1c 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -911,6 +911,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; |