summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-05-11 17:27:27 -0700
committerJames Cook <james@lindenlab.com>2010-05-11 17:27:27 -0700
commit49d6cf471df112eff54eba050f1aa57647c130c3 (patch)
treec5c19ce98533f3404b4542e042ea9e5d24e90169 /indra/newview/skins/default
parent5aa8b5d37eb6824865d09af248aa9d9d518daeb9 (diff)
Clean up merge, advanced preferences layout
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_advanced.xml7
1 files changed, 5 insertions, 2 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 063d51e08d..2452067383 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -301,6 +301,7 @@ Automatic position for:
halign="center"
height="23"
image_overlay="Refresh_Off"
+ layout="topleft"
tool_tip="Reset to Middle Mouse Button"
mouse_opaque="true"
name="set_voice_middlemouse_button"
@@ -314,7 +315,7 @@ Automatic position for:
label="Other Devices"
left="30"
name="joystick_setup_button"
- top_pad="12"
+ top_pad="5"
width="155">
<button.commit_callback
function="Floater.Show"
@@ -324,8 +325,10 @@ Automatic position for:
follows="top|left"
height="15"
label="Use Display Names (PLACEHOLDER)"
+ layout="topleft"
left="30"
name="display_names_check"
width="237"
- tool_tip="Check to use display names in chat, IM, name tags, etc."/>
+ tool_tip="Check to use display names in chat, IM, name tags, etc."
+ top_pad="5"/>
</panel>