summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-01-18 13:36:00 -0800
committerRichard Linden <none@none>2012-01-18 13:36:00 -0800
commitb1d28300fbd37edfb4093b13ea0d243e45d6952b (patch)
tree7ac2d8ee751b492f0aca2df92aa40f6d55bed1e6 /indra/newview/skins/default/xui
parent28fc3cbadb2b4d46b87938b74d61d5537f6c9701 (diff)
parentb75f495526b29fff826fa8bd4e89be7ddf6b2aee (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_general.xml6
1 files changed, 3 insertions, 3 deletions
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 9827180aa7..24882988b0 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -331,7 +331,7 @@
</text>
<radio_group
control_name="LetterKeysFocusChatBar"
- height="20"
+ height="34"
layout="topleft"
left="35"
top_pad="0"
@@ -339,7 +339,7 @@
<radio_item
label="Starts local chat"
name="radio_start_chat"
- top_delta="20"
+ top="0"
layout="topleft"
height="16"
left="0"
@@ -364,7 +364,7 @@
layout="topleft"
left="30"
name="title_afk_text"
- top_pad="15"
+ top_pad="5"
width="190">
Away timeout:
</text>