diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-28 09:20:53 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-28 09:20:53 -0400 |
| commit | b24f9295a2e439314a34f9364f2804e51fae8b8d (patch) | |
| tree | 74f8ad6f7a4f5cb18011e973e8b29ee52a167e54 | |
| parent | 23d3b834bb6fb8d269f4e80d94f9c88774464f17 (diff) | |
| parent | edc0e31bc29f77a821f5ff8a0cb6cf9ba982eb7d (diff) | |
merge changes for storm-1393
| -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; |