summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-01-24 10:56:40 -0500
committerLoren Shih <seraph@lindenlab.com>2011-01-24 10:56:40 -0500
commitd0cba9e9194841e8867afcbd02b3792b652756ab (patch)
tree3a1016da682349dcab75b826c6a9ed002a80a6b2 /indra/newview/skins/default
parent4fefb98cba6cdf5051bfd4d575dcccc468d77836 (diff)
parent7a453b7c9351a743b222bbb2b94809cf7c6b3ce8 (diff)
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/panel_nearby_media.xml16
1 files changed, 2 insertions, 14 deletions
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 8c13ced8f3..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 &gt;&gt;"
- label_selected="Less &lt;&lt;">
+ label_selected="&lt;&lt; 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="More &gt;&gt;"
- label_selected="Less &lt;&lt;">
- <button.commit_callback
- function="MediaListCtrl.MoreLess" />
- </button>
</panel>
<panel
name="nearby_media_panel"