diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-24 16:52:08 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-24 16:52:08 -0800 |
| commit | 859607a4238502a9bc4f650ebdf73cb233f9bb4c (patch) | |
| tree | 268e0b82286f86e5673128f856bad122a8263144 /indra/newview/skins/default | |
| parent | fd74ba5467967cbdb5f7aca8b476080c66df2cd2 (diff) | |
| parent | ce7102d300d71b764a06cc80286d8e95ef0130ee (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/skolb/media
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_media_settings_general.xml | 12 |
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 |