diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-01 09:41:10 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-01 09:41:10 -0400 |
| commit | 4bce553a96dc6d75279f2c2b35fb8060a3f6bae1 (patch) | |
| tree | 70c1b0c2b43f2649777eb8cac7eb927906034640 /indra/newview/llfloatertools.cpp | |
| parent | a1fb8ae0d0679499a68fb8dd1965ab5026878c73 (diff) | |
| parent | 662a92784328f31b680f4f049350dd0f6cacf4c7 (diff) | |
merge viewer-development -> mesh-development
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 1b6feddb6c..dc71ade621 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -423,8 +423,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()); @@ -448,7 +447,6 @@ void LLFloaterTools::refresh() getChildView("RenderingCost")->setEnabled(have_selection && sShowObjectCost); } else -#endif { F32 link_phys_cost = LLSelectMgr::getInstance()->getSelection()->getSelectedLinksetPhysicsCost(); F32 link_cost = LLSelectMgr::getInstance()->getSelection()->getSelectedLinksetCost(); |