diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-11-13 11:11:11 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-11-13 11:11:11 -0500 |
| commit | 69f4b29761aa31d2ac46268eccf5b1cb7edf30f1 (patch) | |
| tree | 100b0a6cbb9416f1e4952e1ba6a08d4f14e07c47 /indra/newview/llfloatertools.cpp | |
| parent | 1aa4e4e68d972ed118ebab14d01c829dc79cfc18 (diff) | |
EXT-2434 update rendering cost to reflect changes in avatar rendering
finished the updates to avatar rendering cost and formalized the
display of selected object render cost in the build tools floater.
Both checkins reviewed by Vir.
Diffstat (limited to 'indra/newview/llfloatertools.cpp')
| -rw-r--r-- | indra/newview/llfloatertools.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index 672160073e..9854d2594b 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -425,13 +425,14 @@ void LLFloaterTools::refresh() // calculate selection rendering cost std::string prim_cost_string; LLResMgr::getInstance()->getIntegerString(prim_cost_string, calcRenderCost()); - childSetTextArg("render_cost", "[COUNT]", prim_cost_string); + childSetTextArg("RenderingCost", "[COUNT]", prim_cost_string); // disable the object and prim counts if nothing selected bool have_selection = ! LLSelectMgr::getInstance()->getSelection()->isEmpty(); childSetEnabled("obj_count", have_selection); childSetEnabled("prim_count", have_selection); + childSetEnabled("RenderingCost", have_selection); // Refresh child tabs mPanelPermissions->refresh(); @@ -562,6 +563,7 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask) mBtnEdit ->setToggleState( edit_visible ); mRadioGroupEdit->setVisible( edit_visible ); + childSetVisible("RenderingCost", edit_visible || focus_visible || move_visible); if (mCheckSelectIndividual) { @@ -983,7 +985,7 @@ S32 LLFloaterTools::calcRenderCost() LLVOVolume *viewer_volume = (LLVOVolume*)select_node->getObject(); if (viewer_volume) { - cost += viewer_volume->getRenderCost(); + cost += viewer_volume->getRenderCost(); } } } |