diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-08 10:10:59 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-08 10:10:59 -0500 |
| commit | a7f02a3e51f07c657a0acd31637f46f74b30daf7 (patch) | |
| tree | c572c162ee7bec027971ca7a64f74032938b20a8 /indra/newview/llfloatertools.cpp | |
| parent | cce59647a99648af63c96168c36e85563da40a1a (diff) | |
| parent | 55b2383f51ffabf7e95595df5d576f383d458ee1 (diff) | |
merge changes for 3.5.0-beta2
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); |