diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-13 10:58:40 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-13 10:58:40 -0400 |
| commit | c681cff64c907bccc307ef9ae7e0b5b10a2cf24f (patch) | |
| tree | 7d39d54802d26596cf0d10bbf18ff3000508fa86 /indra/newview/llfloatertools.cpp | |
| parent | 6221162ab786a7bf03b55278d41731aec06b8150 (diff) | |
| parent | 40a489a9cc1b23db35c7b12f34e35cd2b191a307 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloatertools.cpp')
| -rw-r--r-- | indra/newview/llfloatertools.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index dc71ade621..84fb8bd9e7 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -422,7 +422,7 @@ void LLFloaterTools::refresh() // Refresh object and prim count labels LLLocale locale(LLLocale::USER_LOCALE); - +#if 0 if (!gMeshRepo.meshRezEnabled()) { std::string obj_count_string; @@ -447,6 +447,7 @@ 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(); |