summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-03-22 16:12:41 -0700
committerRoxie Linden <roxie@lindenlab.com>2010-03-22 16:12:41 -0700
commit18b7ab0018695e261dbc5058d76f9d371958b034 (patch)
tree9b4baa5a5ca563ace1b06ac6b3df9fd9c0a0d0f7 /indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
parent60c4621500e478d66a8bdc3a1c80573be2860fee (diff)
parentbe139dfb957e1b0d3c59110284c43630d3b57d23 (diff)
Weekly automated merge from viewer 2.0
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_prim_media_controls.xml')
-rw-r--r--indra/newview/skins/default/xui/en/panel_prim_media_controls.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
index 6b5f0c3896..6bf00373ea 100644
--- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
follows="left|right|top|bottom"
- name="MediaControlsPanel"
+ name="MediaControls"
background_visible="false"
height="200"
layout="topleft"