diff options
| author | simon <none@none> | 2013-03-25 12:19:02 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-03-25 12:19:02 -0700 |
| commit | a976f5c217ce97c70a7e151b9a490e6a6ebf1396 (patch) | |
| tree | 8d86c9060ac05b34b1a9dfd25f03451e18dcc326 /indra/newview/llfloatertools.cpp | |
| parent | cc260a635674c56d8fab88a5cd4dd188b4c9ac9c (diff) | |
| parent | 98a82c50d539451e1931826ca75fbc01d611806d (diff) | |
Pull and merge downstream code with CHUI viewer-development by way of viewer-lion
Diffstat (limited to 'indra/newview/llfloatertools.cpp')
| -rw-r--r-- | indra/newview/llfloatertools.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index 1eb7f4469a..14923eec3c 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -657,8 +657,8 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask) mBtnEdit ->setToggleState( edit_visible ); mRadioGroupEdit->setVisible( edit_visible ); - bool linked_parts = gSavedSettings.getBOOL("EditLinkedParts"); - getChildView("RenderingCost")->setVisible( !linked_parts && (edit_visible || focus_visible || move_visible) && sShowObjectCost); + //bool linked_parts = gSavedSettings.getBOOL("EditLinkedParts"); + //getChildView("RenderingCost")->setVisible( !linked_parts && (edit_visible || focus_visible || move_visible) && sShowObjectCost); mBtnLink->setVisible(edit_visible); mBtnUnlink->setVisible(edit_visible); |