diff options
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llpanelnearbymedia.cpp | 5 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_nearby_media.xml | 16 |
2 files changed, 4 insertions, 17 deletions
diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp index fcc67d6840..14e39f2c48 100644 --- a/indra/newview/llpanelnearbymedia.cpp +++ b/indra/newview/llpanelnearbymedia.cpp @@ -958,7 +958,7 @@ void LLPanelNearByMedia::onAdvancedButtonClick() void LLPanelNearByMedia::onMoreLess() { - bool is_more = getChild<LLUICtrl>("more_btn")->getVisible(); + bool is_more = getChild<LLButton>("more_btn")->getToggleState(); mNearbyMediaPanel->setVisible(is_more); // enable resizing when expanded @@ -969,8 +969,7 @@ void LLPanelNearByMedia::onMoreLess() setShape(new_rect); - getChild<LLUICtrl>("more_btn")->setVisible(!is_more); - getChild<LLUICtrl>("less_btn")->setVisible(is_more); + getChild<LLUICtrl>("more_btn")->setVisible(true); } void LLPanelNearByMedia::updateControls() diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml index aac3608e13..9bd60b935f 100644 --- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml @@ -68,24 +68,12 @@ right="-8" width="66" height="22" + is_toggle="true" label="More >>" - label_selected="More >>"> + label_selected="<< Less"> <button.commit_callback function="MediaListCtrl.MoreLess" /> </button> - <button - name="less_btn" - follows="right" - tool_tip="Advanced Controls" - top_delta="0" - right="-8" - width="66" - height="22" - label="<< Less" - label_selected="<< Less"> - <button.commit_callback - function="MediaListCtrl.MoreLess" /> - </button> </panel> <panel name="nearby_media_panel" |