diff options
| author | Squire <squire@lindenlab.com> | 2011-06-28 11:48:25 -0700 |
|---|---|---|
| committer | Squire <squire@lindenlab.com> | 2011-06-28 11:48:25 -0700 |
| commit | 03969822f5cff99c124772466bf4e86da9fa05aa (patch) | |
| tree | 7caba1865fb37d905e0b33e62baab3c19971eace /indra/newview/llfloatertools.cpp | |
| parent | df91a44d2951fa348796610f0c84be25bd2031e0 (diff) | |
| parent | 3bc99274f19ce0cbc3e600c0010655e2778ab405 (diff) | |
Merged in viewer-development changes
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; |