diff options
author | Mike Antipov <mantipov@productengine.com> | 2010-03-19 17:12:31 +0200 |
---|---|---|
committer | Mike Antipov <mantipov@productengine.com> | 2010-03-19 17:12:31 +0200 |
commit | d217adeede2d99ac6f48064388d91aa14ab9a4d2 (patch) | |
tree | 55c3fded0898c82f5a7165354ab056bbea00990f /indra/newview | |
parent | 4347af5763672d0b575ad255aa3565a51c0a632e (diff) | |
parent | 627c5a365f4506c30af1471c4e1880f43922ca48 (diff) |
merge with tip
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_prim_media_controls.xml | 2 |
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" |