summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2011-01-12 08:24:38 -0500
committerJonathan Yap <none@none>2011-01-12 08:24:38 -0500
commit3703f0bb0d7cd20c801d88cb77632c239010d26b (patch)
tree34b2a17c7a5546542fd0163630c7883af5133a73
parent7a1d7d15b9658b6bde224bd87e476ac152925413 (diff)
STORM-844 "More" should be "Less" when Media Control is open
-rw-r--r--doc/contributions.txt7
-rw-r--r--indra/newview/skins/default/xui/en/panel_nearby_media.xml6
2 files changed, 7 insertions, 6 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 9266ae3c5b..0d7bed2f78 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -366,15 +366,16 @@ JB Kraft
Joghert LeSabre
VWR-64
Jonathan Yap
- STORM-596
STORM-523
+ STORM-596
STORM-616
STORM-679
- STORM-737
STORM-726
+ STORM-737
+ STORM-785
STORM-812
+ STORM-844
VWR-17801
- STORM-785
Kage Pixel
VWR-11
Ken March
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..aac3608e13 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
@@ -69,7 +69,7 @@
width="66"
height="22"
label="More &gt;&gt;"
- label_selected="Less &lt;&lt;">
+ label_selected="More &gt;&gt;">
<button.commit_callback
function="MediaListCtrl.MoreLess" />
</button>
@@ -81,8 +81,8 @@
right="-8"
width="66"
height="22"
- label="More &gt;&gt;"
- label_selected="Less &lt;&lt;">
+ label="&lt;&lt; Less"
+ label_selected="&lt;&lt; Less">
<button.commit_callback
function="MediaListCtrl.MoreLess" />
</button>