diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-06-30 19:24:39 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-06-30 19:24:39 -0400 |
| commit | aec182e3dbc2e4c492167fc250583b9de5ec43f8 (patch) | |
| tree | c4a56b20693ac7ee4a203d0bd58a5992fdce66b8 /indra/newview/llfloatertools.cpp | |
| parent | 73afcff635f3d25432167ca43ab0b82aadd6c687 (diff) | |
| parent | f07173a9689237bf2d8218600c15d6bf4d047cdc (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloatertools.cpp')
| -rw-r--r-- | indra/newview/llfloatertools.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
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; |