summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-11-24 16:51:04 -0800
committerRick Pasetto <rick@lindenlab.com>2009-11-24 16:51:04 -0800
commitce7102d300d71b764a06cc80286d8e95ef0130ee (patch)
treeb2963103863f0dbeef43d45f53758e6961dc178e /indra/newview/skins
parenta49862a4fcb2d00d1778092191321e033a693076 (diff)
FIX DEV-43033 - the prim media controls were "stealing focus" and so would clobber any drop-downs
Reviewed by James (thanks, James!)
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/panel_media_settings_general.xml12
1 files changed, 2 insertions, 10 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
index 686f4ac1d5..e00f654750 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
@@ -93,27 +93,19 @@
</text>
<combo_box
allow_text_entry="false"
- bottom_delta="-20"
- enabled="true"
+ bottom_delta="-20"
follows="left|top"
height="18"
left="10"
- max_chars="20"
- mouse_opaque="true"
+ max_chars="20"
name="controls"
width="120">
<combo_item
- type="string"
- length="1"
- enabled="true"
name="Standard"
value="Standard">
Standard
</combo_item>
<combo_item
- type="string"
- length="1"
- enabled="true"
name="Mini"
value="Mini">
Mini