summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLis Pardi <lis@lindenlab.com>2009-12-09 12:07:16 -0500
committerLis Pardi <lis@lindenlab.com>2009-12-09 12:07:16 -0500
commit89c0fc48b23c51748047803483aa404accc4d6f3 (patch)
treec08ac4af193be5c72409e434e7a0ba6ad0912c70
parentcefa8e4f54e4aa1b8d23fcdc4240219c266b568b (diff)
ext-2981 button and text editor height schould be 23px, not 16px
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_advanced.xml6
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_alerts.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_general.xml6
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml8
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_privacy.xml6
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_setup.xml10
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_sound.xml6
7 files changed, 23 insertions, 23 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 6a61953319..78b90eefcc 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -70,7 +70,7 @@
</text>
<combo_box
allow_text_entry="true"
- height="20"
+ height="23"
follows="left|top"
layout="topleft"
left_pad="0"
@@ -306,7 +306,7 @@ Avatars:
<button
follows="top|left"
enabled_control="EnableVoiceChat"
- height="20"
+ height="23"
label="Set Key"
left_delta="0"
name="set_voice_hotkey_button"
@@ -320,7 +320,7 @@ Avatars:
enabled_control="EnableVoiceChat"
follows="left"
halign="center"
- height="20"
+ height="23"
label="Middle Mouse Button"
left_delta="120"
mouse_opaque="true"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
index a94df4150d..d4f4053dad 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
@@ -63,7 +63,7 @@
<button
enabled_control="FirstSelectedDisabledPopups"
follows="top|left"
- height="20"
+ height="23"
image_disabled="PushButton_Disabled"
image_disabled_selected="PushButton_Disabled"
image_overlay="Arrow_Up"
@@ -81,7 +81,7 @@
<button
enabled_control="FirstSelectedEnabledPopups"
follows="top|left"
- height="20"
+ height="23"
image_disabled="PushButton_Disabled"
image_disabled_selected="PushButton_Disabled"
image_overlay="Arrow_Down"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index ee9bfbae93..8aba8b9dd1 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -24,7 +24,7 @@
<combo_box
control_name="Language"
follows="left|bottom"
- height="18"
+ height="23"
layout="topleft"
left_delta="50"
max_chars="135"
@@ -136,7 +136,7 @@
<combo_box
control_name="PreferredMaturity"
follows="left|bottom"
- height="18"
+ height="23"
layout="topleft"
left_delta="-10"
name="maturity_desired_combobox"
@@ -170,7 +170,7 @@
<combo_box
control_name="LoginLocation"
follows="left|bottom"
- height="18"
+ height="23"
layout="topleft"
left_delta="50"
name="start_location_combo"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index eb00b9b79a..04985d0fa9 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -708,7 +708,7 @@
</panel>
<button
follows="left|bottom"
- height="20"
+ height="23"
label="Apply"
label_selected="Apply"
layout="topleft"
@@ -721,7 +721,7 @@
</button>
<button
follows="left|bottom"
- height="20"
+ height="23"
label="Reset"
layout="topleft"
left_pad="3"
@@ -734,7 +734,7 @@
<button
control_name="ShowAdvancedGraphicsSettings"
follows="right|bottom"
- height="20"
+ height="23"
is_toggle="true"
label="Advanced"
layout="topleft"
@@ -744,7 +744,7 @@
width="115" />
<button
follows="right|bottom"
- height="20"
+ height="23"
label="Hardware"
label_selected="Hardware"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index 29e9b476eb..25d7ba0903 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -15,7 +15,7 @@
</panel.string>
<button
follows="left|bottom"
- height="20"
+ height="23"
label="Clear History"
layout="topleft"
left="30"
@@ -160,7 +160,7 @@
<button
enabled="false"
follows="right|bottom"
- height="20"
+ height="23"
label="Browse"
label_selected="Browse"
layout="topleft"
@@ -173,7 +173,7 @@
</button>
<button
follows="left|bottom"
- height="20"
+ height="23"
label="Block list"
layout="topleft"
left="30"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 5cabae5fa0..a7def5306e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -10,7 +10,7 @@
top="1"
width="517">
<button
- height="20"
+ height="23"
label="Other Devices"
layout="topleft"
left="30"
@@ -138,7 +138,7 @@
enabled_control="BrowserProxyEnabled"
decimal_digits="0"
follows="left|top"
- height="16"
+ height="23"
increment="1"
initial_value="80"
label="Port number:"
@@ -208,7 +208,7 @@
width="205" />
<button
follows="left|top"
- height="22"
+ height="23"
label="Browse"
label_selected="Browse"
layout="topleft"
@@ -221,7 +221,7 @@
</button>
<button
follows="left|top"
- height="22"
+ height="23"
label="Reset"
label_selected="Set"
layout="topleft"
@@ -314,7 +314,7 @@
width="200" />
<button
follows="left|top"
- height="22"
+ height="23"
enabled="false"
label="Browse"
label_selected="Browse"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index 854227619b..102a53ad90 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -343,7 +343,7 @@
<button
control_name="ShowDeviceSettings"
follows="left|top"
- height="19"
+ height="23"
is_toggle="true"
label="Input/Output devices"
layout="topleft"
@@ -391,7 +391,7 @@
Input
</text>
<combo_box
- height="19"
+ height="23"
control_name="VoiceInputAudioDevice"
layout="topleft"
left="165"
@@ -505,7 +505,7 @@
</text>
<combo_box
control_name="VoiceOutputAudioDevice"
- height="19"
+ height="23"
layout="topleft"
left="165"
max_chars="128"