summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-07-12 18:40:51 +0300
committerMike Antipov <mantipov@productengine.com>2010-07-12 18:40:51 +0300
commitee6c66316e9c9a6c019232b5c773d2063328cdd3 (patch)
tree61be2476631c8fb05b63d4cfe0df5c265b4fd1d8 /indra/newview/skins/default
parent8435d93653e4aa3e1c7602c5eaf34b4fed1c74f2 (diff)
parent34cb8b7402a7e4727dd28ddc90d8d142dbbed3b6 (diff)
Merge with another head in branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/panel_nearby_media.xml2
1 files changed, 2 insertions, 0 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 d8675b3512..584ca8b3b5 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
@@ -104,6 +104,7 @@
follows="top|left"
font="SansSerif"
left="10"
+ name="nearby_media_title"
width="100">
Nearby Media
</text>
@@ -114,6 +115,7 @@
font="SansSerif"
top_pad="15"
left="10"
+ name="show_text"
width="40">
Show:
</text>