aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-07-16 00:02:43 -0700
committerMcCabe Maxsted2010-07-16 00:09:51 -0700
commit8c7db44a2a85f8ea907386bc1d1c74babbae99d8 (patch)
tree025932355bc6769b8df13f2e99fd1c8dfc13d6ee /linden/indra/newview/skins/default/xui
parentfix: don't change inventory floater title continously without need (take2) (diff)
downloadmeta-impy-8c7db44a2a85f8ea907386bc1d1c74babbae99d8.zip
meta-impy-8c7db44a2a85f8ea907386bc1d1c74babbae99d8.tar.gz
meta-impy-8c7db44a2a85f8ea907386bc1d1c74babbae99d8.tar.bz2
meta-impy-8c7db44a2a85f8ea907386bc1d1c74babbae99d8.tar.xz
Feature #277: added the grid manager to Preferences > General and changed the start location to a pulldown to match the login screen
Diffstat (limited to 'linden/indra/newview/skins/default/xui')
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml29
1 files changed, 18 insertions, 11 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index cc87175..6b8f7aa 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -2,17 +2,24 @@
2<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom" 2<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
3 height="408" label="General" left="102" mouse_opaque="true" 3 height="408" label="General" left="102" mouse_opaque="true"
4 name="general_panel" width="517"> 4 name="general_panel" width="517">
5 <radio_group bottom="-45" draw_border="false" follows="left|bottom" height="40" left="151" 5 <combo_box name="default_location_combo"
6 name="default_start_location" width="220"> 6 bottom="-22" left="155" height="16" width="150"
7 <radio_item bottom="-20" height="20" left="0" name="MyHome" width="50" 7 follows="left|bottom" font="SansSerifSmall"
8 tool_tip="Log into my home location by default."> 8 mouse_opaque="true" allow_text_entry="true" max_chars="128">
9 My home 9 <combo_item name="MyHome" value="My Home">
10 </radio_item> 10 My Home
11 <radio_item bottom="-20" height="20" left="100" name="MyLastLocation" width="50" 11 </combo_item>
12 tool_tip="Log into my last location by default."> 12 <combo_item name="MyLastLocation" value="My Last Location">
13 My last location 13 My Last Location
14 </radio_item> 14 </combo_item>
15 </radio_group> 15 <combo_item name="Typeregionname" value="&lt;Type region name&gt;">
16 &lt;Type region name&gt;
17 </combo_item>
18 </combo_box>
19 <button name="grid_btn" label="Grid Manager"
20 bottom_delta="0" left="330" height="16" width="100"
21 follows="left|bottom" font="SansSerifSmall" halign="center"
22 mouse_opaque="true" scale_image="TRUE" />
16 <check_box bottom="-44" enabled="true" follows="left|top" 23 <check_box bottom="-44" enabled="true" follows="left|top"
17 font="SansSerifSmall" height="16" initial_value="true" 24 font="SansSerifSmall" height="16" initial_value="true"
18 label="Show start location at login screen" left="151" mouse_opaque="true" 25 label="Show start location at login screen" left="151" mouse_opaque="true"