diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-07-12 14:48:34 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-07-12 14:48:34 -0600 |
| commit | c45c603eeefb3b5692213e7840dda6a55f6e4b68 (patch) | |
| tree | cbdc1782cbd78f169c2287e19fcb2e2583c1bc20 | |
| parent | 5a767e4cebed49a3a2934b21fd2f265a245828f4 (diff) | |
| parent | 5d25338ed0a8580be43f86ff07d777f21d1147e8 (diff) | |
Automated merge with http://hg.secondlife.com/mesh-development
| -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(); |