summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/panel_nearby_media.xml
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-09 11:25:45 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-09 11:25:45 +0100
commit59a90f197f9b36077f20da4de5945ed93526df26 (patch)
treec433bc16dac6116925399af1382b7737ab1c26af /indra/newview/skins/default/xui/en/panel_nearby_media.xml
parent95e9e569bfaf713eb71f3dba7206aceae06f74f6 (diff)
parent4ed913c3760308ea67db8beb9e6330933104a8ab (diff)
merge from viewer-trunk
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_nearby_media.xml')
-rw-r--r--indra/newview/skins/default/xui/en/panel_nearby_media.xml12
1 files changed, 6 insertions, 6 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..ff2aae645b 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
+ can_resize="true"
+ can_close="false"
bg_opaque_image="Volume_Background"
bg_alpha_image="Volume_Background"
background_opaque="true"
background_visible="true"
layout="topleft"
- width="328"
+ width="270"
height="230"
name="nearby_media"
help_topic="nearby_media">
@@ -27,7 +29,7 @@
follows="left"
tool_tip="Turn all nearby media off"
left="8"
- width="95"
+ width="66"
height="22"
label="Stop All">
<button.commit_callback
@@ -38,7 +40,7 @@
follows="left"
tool_tip="Turn all nearby media on"
left_pad="4"
- width="95"
+ width="66"
height="22"
label="Start All">
<button.commit_callback
@@ -56,6 +58,7 @@
top_delta="0"
left_pad="4"
height="22"
+ min_width="28"
width="28">
<button.commit_callback
function="MediaListCtrl.GoMediaPrefs" />
@@ -104,7 +107,6 @@
follows="top|left"
font="SansSerif"
left="10"
- name="nearby_media_title"
width="100">
Nearby Media
</text>
@@ -115,7 +117,6 @@
font="SansSerif"
top_pad="15"
left="10"
- name="show_text"
width="40">
Show:
</text>
@@ -187,7 +188,6 @@
bevel_style="in"
background_visible="false"
follows="left|right|bottom"
- name="media_controls_panel"
top_pad="5"
height="30"
left="10"