summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/panel_preferences_general.xml
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2009-08-04 01:12:59 +0000
committerRichard Nelson <richard@lindenlab.com>2009-08-04 01:12:59 +0000
commiteb853f55c07ae4a3c3f2aa05fbabcf2e4b4dc115 (patch)
tree7707fccb8d0946b6257d5ed7c5dfd3941c53eec0 /indra/newview/skins/default/xui/en/panel_preferences_general.xml
parentdb5cda26676f376f18816013c0c5e3fbad5b20d0 (diff)
svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_preferences_general.xml')
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_general.xml9
1 files changed, 4 insertions, 5 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 70d15c237b..2d42757150 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -30,7 +30,7 @@
max_chars="135"
name="language_combobox"
top_pad="10"
- width="155">
+ width="170">
<combo_box.item
enabled="true"
label="System Default"
@@ -154,7 +154,7 @@
left_delta="50"
name="maturity_desired_combobox"
top_pad="10"
- width="155">
+ width="170">
<combo_box.item
label="PG, Mature and Adult"
name="Desired_Adult"
@@ -188,7 +188,7 @@
left_delta="50"
name="start_location_combo"
top_pad="10"
- width="155">
+ width="170">
<combo_box.item
label="My Last Location"
name="MyLastLocation"
@@ -221,7 +221,6 @@
width="400">
Name tags:
</text>
- <!-- THIS IS A NEW RADIO GROUP ADDED BY LIS -->
<radio_group
control_name="AvatarNameTagMode"
height="30"
@@ -273,7 +272,7 @@
left_delta="0"
name="show_all_title_checkbox"
top_pad="5"
- width="256" />
+ width="300" />
<text
type="string"
length="1"