aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorRevolutionSmythe2010-10-20 16:31:09 -0500
committerMcCabe Maxsted2010-11-01 16:58:02 -0700
commitaf6877fbfe94e80948c559cf77f008049f8168dc (patch)
tree4fe687aaec6a1b964a0e989d3c03c143b4ab07f6 /linden/indra/newview/skins/default/xui
parentMerge remote branch 'thickbrick/weekly' into weekly (diff)
downloadmeta-impy-af6877fbfe94e80948c559cf77f008049f8168dc.zip
meta-impy-af6877fbfe94e80948c559cf77f008049f8168dc.tar.gz
meta-impy-af6877fbfe94e80948c559cf77f008049f8168dc.tar.bz2
meta-impy-af6877fbfe94e80948c559cf77f008049f8168dc.tar.xz
Finishes the OpenRegionSettings module, adds a new panel to Region/Estate for OpenRegionSettings, adds the new CAPS based WindLight Settings module, cleans up a few UI parts, and rebuilds the ToS window to support OpenSim regions better.
Diffstat (limited to 'linden/indra/newview/skins/default/xui')
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml10
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_tos.xml9
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_water.xml549
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_windlight_manager.xml35
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml45
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_windlight_remote_save.xml123
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml366
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_attachment.xml46
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/notifications.xml84
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml10
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml8
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml46
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml28
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_radar.xml8
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml13
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_region_general.xml13
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_region_open_region_settings.xml76
19 files changed, 926 insertions, 547 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml b/linden/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml
index 0e5a642..cd88c2e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml
@@ -58,7 +58,7 @@
58 font="SansSerif" mouse_opaque="true" name="Refresh" scale_image="TRUE" /> 58 font="SansSerif" mouse_opaque="true" name="Refresh" scale_image="TRUE" />
59 <slider bottom_delta="-20" left="10" follows="left|top" width="175" height="15" 59 <slider bottom_delta="-20" left="10" follows="left|top" width="175" height="15"
60 name="near_me_range" label="Range" control_name="NearMeRange" 60 name="near_me_range" label="Range" control_name="NearMeRange"
61 min_val="5" max_val="40" increment="1" initial_val="20" decimal_digits="0" /> 61 min_val="5" max_val="512" increment="1" initial_val="20" decimal_digits="0" />
62 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 62 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
63 bottom_delta="0" left="185" drop_shadow_visible="true" follows="left|top" 63 bottom_delta="0" left="185" drop_shadow_visible="true" follows="left|top"
64 font="SansSerifSmall" h_pad="0" halign="left" height="15" 64 font="SansSerifSmall" h_pad="0" halign="left" height="15"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml b/linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml
index e2bafbf..0a4f2a9 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml
@@ -58,9 +58,11 @@
58 <button bottom="-140" follows="left|top" font="SansSerifSmall" height="20" 58 <button bottom="-140" follows="left|top" font="SansSerifSmall" height="20"
59 label="Use Estate Time" left="8" name="EnvUseEstateTimeButton" width="137" /> 59 label="Use Estate Time" left="8" name="EnvUseEstateTimeButton" width="137" />
60 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" 60 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20"
61 label="Advanced Sky" left="154" name="EnvAdvancedSkyButton" width="137" /> 61 label="Advanced Sky" left="154" name="EnvAdvancedSkyButton" width="107" />
62 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" 62 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20"
63 label="Advanced Water" left="300" name="EnvAdvancedWaterButton" width="137" /> 63 label="Advanced Water" left="270" name="EnvAdvancedWaterButton" width="137" />
64 <button bottom="-40" follows="left|top" font="SansSerif" height="18" label="?" 64 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20"
65 label="Advanced WindLight Manager" left="416" name="EnvWLManager" width="177" />
66 <button bottom="-40" follows="left|top" font="SansSerif" height="18" label="?"
65 left="570" name="EnvSettingsHelpButton" width="22" /> 67 left="570" name="EnvSettingsHelpButton" width="22" />
66</floater> 68</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml b/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
index 82a65b8..0175508 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
@@ -5,7 +5,7 @@
5 embedded_items="false" enabled="true" follows="left|top|right|bottom" 5 embedded_items="false" enabled="true" follows="left|top|right|bottom"
6 font="Monospace" height="376" ignore_tab="false" left="4" 6 font="Monospace" height="376" ignore_tab="false" left="4"
7 max_length="65536" mouse_opaque="true" name="Script Editor" width="492" border_drop_shadow_visible="false" border_visible="false" bevel_style="none" border_style="line" border_thickness="0" 7 max_length="65536" mouse_opaque="true" name="Script Editor" width="492" border_drop_shadow_visible="false" border_visible="false" bevel_style="none" border_style="line" border_thickness="0"
8 word_wrap="true" show_line_numbers="true"> 8 word_wrap="true" show_line_numbers="true" spell_check="false">
9 Loading... 9 Loading...
10 </text_editor> 10 </text_editor>
11 <button bottom="-499" enabled="true" follows="right|bottom" font="SansSerif" 11 <button bottom="-499" enabled="true" follows="right|bottom" font="SansSerif"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tos.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tos.xml
index 485cfcc..beea02f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tos.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tos.xml
@@ -15,15 +15,14 @@
15 bottom="-50" drop_shadow_visible="true" follows="left|top" font="SansSerif" 15 bottom="-50" drop_shadow_visible="true" follows="left|top" font="SansSerif"
16 h_pad="0" halign="left" height="30" left="16" mouse_opaque="true" 16 h_pad="0" halign="left" height="30" left="16" mouse_opaque="true"
17 name="tos_heading" v_pad="0" width="552"> 17 name="tos_heading" v_pad="0" width="552">
18 Please read the following Terms of Service carefully. To continue logging in to Second Life, 18 Please read the following Terms of Service carefully. To continue logging in you must accept the agreement.
19you must accept the agreement.
20 </text> 19 </text>
21 <text_editor bottom="-376" embedded_items="false" follows="left|top" font="SansSerif" 20 <text_editor bottom="-376" embedded_items="false" follows="left|top" font="SansSerif"
22 height="283" left="16" max_length="65536" mouse_opaque="true" 21 height="283" left="16" max_length="65536" mouse_opaque="true"
23 name="tos_text" width="568" 22 name="tos_text" width="568"
24 word_wrap="true"> 23 word_wrap="true">
25 TOS_TEXT 24 TOS_TEXT
26 </text_editor> 25 </text_editor>
27 <!-- Loading text says: "Loading Terms of Service..." URL encoded --> 26 <!-- Loading text says: "Loading Terms of Service..." URL encoded -->
28 <web_browser bottom="-406" embedded_items="false" follows="left|top" font="SansSerif" 27 <web_browser bottom="-406" embedded_items="false" follows="left|top" font="SansSerif"
29 height="340" left="16" max_length="65536" mouse_opaque="true" 28 height="340" left="16" max_length="65536" mouse_opaque="true"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_water.xml b/linden/indra/newview/skins/default/xui/en-us/floater_water.xml
index 441ce7b..a05deb6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_water.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_water.xml
@@ -1,273 +1,276 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true" 2<floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true"
3 can_resize="false" height="240" left="50" min_height="200" 3 can_resize="false" height="240" left="50" min_height="200"
4 min_width="400" mouse_opaque="true" name="Water Floater" 4 min_width="400" mouse_opaque="true" name="Water Floater"
5 rect_control="FloaterAdvancedWaterRect" title="Advanced Water Editor" 5 rect_control="FloaterAdvancedWaterRect" title="Advanced Water Editor"
6 width="700"> 6 width="700">
7 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 7 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
8 bottom="-50" drop_shadow_visible="true" follows="left|top|right" 8 bottom="-50" drop_shadow_visible="true" follows="left|top|right"
9 font="SansSerif" h_pad="0" halign="left" height="16" 9 font="SansSerif" h_pad="0" halign="left" height="16"
10 left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0" 10 left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0"
11 width="110"> 11 width="110">
12 Water Presets: 12 Water Presets:
13 </text> 13 </text>
14 <combo_box allow_text_entry="false" bottom="-52" follows="left|top" height="18" 14 <combo_box allow_text_entry="false" bottom="-52" follows="left|top" height="18"
15 left_delta="120" max_chars="20" mouse_opaque="true" 15 left_delta="120" max_chars="20" mouse_opaque="true"
16 name="WaterPresetsCombo" width="150" /> 16 name="WaterPresetsCombo" width="150" />
17 <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20" 17 <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
18 label="" label_selected="" left_delta="-25" image_overlay="arrow_left.tga" 18 label="" label_selected="" left_delta="-25" image_overlay="arrow_left.tga"
19 mouse_opaque="true" name="prev" scale_image="true" width="20" /> 19 mouse_opaque="true" name="prev" scale_image="true" width="20" />
20 <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20" 20 <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
21 label="" label_selected="" left_delta="180" image_overlay="arrow_right.tga" 21 label="" label_selected="" left_delta="180" image_overlay="arrow_right.tga"
22 mouse_opaque="true" name="next" scale_image="true" width="20" /> 22 mouse_opaque="true" name="next" scale_image="true" width="20" />
23 <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20" 23 <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
24 label="New" right="-270" 24 label="New" right="-270"
25 mouse_opaque="true" name="WaterNewPreset" scale_image="true" width="100" /> 25 mouse_opaque="true" name="WaterNewPreset" scale_image="true" width="100" />
26 <flyout_button bottom_delta="0" follows="left|top" height="20" label="Save to Disk" 26 <flyout_button bottom_delta="0" follows="left|top" height="20" label="Save to Disk"
27 right="-140" halign="center" list_position="above" enabled="true" 27 right="-140" halign="center" list_position="above" enabled="true"
28 mouse_opaque="true" width="125" name="WaterSavePreset"> 28 mouse_opaque="true" width="125" name="WaterSavePreset">
29 <flyout_button_item value="save_inventory_item" name="save_inventory_item"> 29 <flyout_button_item value="save_inventory_item" name="save_inventory_item">
30 Save to Inventory 30 Save to Inventory
31 </flyout_button_item> 31 </flyout_button_item>
32 <flyout_button_item value="save_disk_item" name="save_disk_item"> 32 <flyout_button_item value="save_disk_item" name="save_disk_item">
33 Save to Disk 33 Save to Disk
34 </flyout_button_item> 34 </flyout_button_item>
35 </flyout_button> 35 <flyout_button_item value="send_to_server_item" name="send_to_server_item">
36 <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20" 36 Send to Server
37 label="Delete File" label_selected="Delete File" right="-10" 37 </flyout_button_item>
38 mouse_opaque="true" name="WaterDeletePreset" scale_image="true" width="125" /> 38 </flyout_button>
39 <tab_container bottom="-240" follows="left|top" height="180" left="0" 39 <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
40 mouse_opaque="false" name="Water Tabs" tab_position="top" width="700"> 40 label="Delete File" label_selected="Delete File" right="-10"
41 <panel border="true" bottom="-240" follows="left|top|right|bottom" height="180" 41 mouse_opaque="true" name="WaterDeletePreset" scale_image="true" width="125" />
42 label="Settings" left="1" mouse_opaque="false" 42 <tab_container bottom="-240" follows="left|top" height="180" left="0"
43 name="Settings" width="698"> 43 mouse_opaque="false" name="Water Tabs" tab_position="top" width="700">
44 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 44 <panel border="true" bottom="-240" follows="left|top|right|bottom" height="180"
45 bottom="-20" drop_shadow_visible="true" follows="left|top|right" 45 label="Settings" left="1" mouse_opaque="false"
46 font="SansSerif" h_pad="0" halign="left" height="16" 46 name="Settings" width="698">
47 left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355"> 47 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
48 Water Fog Color 48 bottom="-20" drop_shadow_visible="true" follows="left|top|right"
49 </text> 49 font="SansSerif" h_pad="0" halign="left" height="16"
50 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" 50 left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">
51 left="160" name="WaterFogColorHelp" width="18" /> 51 Water Fog Color
52 <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-80" 52 </text>
53 can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top" 53 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
54 height="50" label="" left="40" mouse_opaque="true" 54 left="160" name="WaterFogColorHelp" width="18" />
55 name="WaterFogColor" tool_tip="Click to open Color Picker" width="40" /> 55 <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-80"
56 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 56 can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top"
57 bottom="-90" drop_shadow_visible="true" follows="left|top|right" 57 height="50" label="" left="40" mouse_opaque="true"
58 font="SansSerif" h_pad="0" halign="left" height="16" 58 name="WaterFogColor" tool_tip="Click to open Color Picker" width="40" />
59 left="10" mouse_opaque="true" name="WaterFogDensText" v_pad="0" width="355"> 59 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
60 Fog Density Exponent 60 bottom="-90" drop_shadow_visible="true" follows="left|top|right"
61 </text> 61 font="SansSerif" h_pad="0" halign="left" height="16"
62 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" 62 left="10" mouse_opaque="true" name="WaterFogDensText" v_pad="0" width="355">
63 left="160" name="WaterFogDensityHelp" width="18" /> 63 Fog Density Exponent
64 <slider bottom_delta="-30" can_edit_text="false" control_name="WaterFogDensity" 64 </text>
65 decimal_digits="1" follows="left" height="10" increment=".1" 65 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
66 initial_val="16" label="" left="24" max_val="10" min_val="0" 66 left="160" name="WaterFogDensityHelp" width="18" />
67 mouse_opaque="true" name="WaterFogDensity" show_text="true" value="1.0" 67 <slider bottom_delta="-30" can_edit_text="false" control_name="WaterFogDensity"
68 width="200" /> 68 decimal_digits="1" follows="left" height="10" increment=".1"
69 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 69 initial_val="16" label="" left="24" max_val="10" min_val="0"
70 bottom="-130" drop_shadow_visible="true" follows="left|top|right" 70 mouse_opaque="true" name="WaterFogDensity" show_text="true" value="1.0"
71 font="SansSerif" h_pad="0" halign="left" height="16" 71 width="200" />
72 left="10" mouse_opaque="true" name="WaterUnderWaterFogModText" v_pad="0" 72 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
73 width="355"> 73 bottom="-130" drop_shadow_visible="true" follows="left|top|right"
74 Underwater Fog Modifier 74 font="SansSerif" h_pad="0" halign="left" height="16"
75 </text> 75 left="10" mouse_opaque="true" name="WaterUnderWaterFogModText" v_pad="0"
76 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" 76 width="355">
77 left="160" name="WaterUnderWaterFogModHelp" width="18" /> 77 Underwater Fog Modifier
78 <slider bottom_delta="-30" can_edit_text="false" control_name="" decimal_digits="2" 78 </text>
79 follows="left" height="10" increment=".01" initial_val="16" label="" 79 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
80 left="24" max_val="2" min_val="0" mouse_opaque="true" 80 left="160" name="WaterUnderWaterFogModHelp" width="18" />
81 name="WaterUnderWaterFogMod" show_text="true" value="0.25" width="200" /> 81 <slider bottom_delta="-30" can_edit_text="false" control_name="" decimal_digits="2"
82 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 82 follows="left" height="10" increment=".01" initial_val="16" label=""
83 bottom="-20" drop_shadow_visible="true" follows="left|top|right" 83 left="24" max_val="2" min_val="0" mouse_opaque="true"
84 font="SansSerif" h_pad="0" halign="left" height="16" 84 name="WaterUnderWaterFogMod" show_text="true" value="0.25" width="200" />
85 left="245" mouse_opaque="true" name="BDensText" v_pad="0" width="355"> 85 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
86 Reflection Wavelet Scale 86 bottom="-20" drop_shadow_visible="true" follows="left|top|right"
87 </text> 87 font="SansSerif" h_pad="0" halign="left" height="16"
88 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" 88 left="245" mouse_opaque="true" name="BDensText" v_pad="0" width="355">
89 left="395" name="WaterNormalScaleHelp" width="18" /> 89 Reflection Wavelet Scale
90 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 90 </text>
91 bottom="-37" drop_shadow_visible="true" follows="left|top|right" 91 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
92 font="SansSerifSmall" h_pad="0" halign="center" height="16" 92 left="395" name="WaterNormalScaleHelp" width="18" />
93 left="245" mouse_opaque="true" name="BHText2" v_pad="0" width="10"> 93 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
94 1 94 bottom="-37" drop_shadow_visible="true" follows="left|top|right"
95 </text> 95 font="SansSerifSmall" h_pad="0" halign="center" height="16"
96 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 96 left="245" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
97 bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right" 97 1
98 font="SansSerifSmall" h_pad="0" halign="center" height="16" 98 </text>
99 left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10"> 99 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
100 2 100 bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
101 </text> 101 font="SansSerifSmall" h_pad="0" halign="center" height="16"
102 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 102 left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
103 bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right" 103 2
104 font="SansSerifSmall" h_pad="0" halign="center" height="16" 104 </text>
105 left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10"> 105 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
106 3 106 bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
107 </text> 107 font="SansSerifSmall" h_pad="0" halign="center" height="16"
108 <slider bottom="-50" can_edit_text="false" control_name="WaterNormalScaleX" 108 left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
109 decimal_digits="1" follows="left" height="10" increment="0.1" 109 3
110 initial_val="0.7" label="" left="259" max_val="10" min_val="0" 110 </text>
111 mouse_opaque="true" name="WaterNormalScaleX" show_text="true" value="1.0" 111 <slider bottom="-50" can_edit_text="false" control_name="WaterNormalScaleX"
112 width="200" /> 112 decimal_digits="1" follows="left" height="10" increment="0.1"
113 <slider bottom_delta="-11" can_edit_text="false" control_name="WaterNormalScaleY" 113 initial_val="0.7" label="" left="259" max_val="10" min_val="0"
114 decimal_digits="1" follows="left" height="10" increment="0.1" 114 mouse_opaque="true" name="WaterNormalScaleX" show_text="true" value="1.0"
115 initial_val="0.7" label="" left="259" max_val="10" min_val="0" 115 width="200" />
116 mouse_opaque="true" name="WaterNormalScaleY" show_text="true" value="1.0" 116 <slider bottom_delta="-11" can_edit_text="false" control_name="WaterNormalScaleY"
117 width="200" /> 117 decimal_digits="1" follows="left" height="10" increment="0.1"
118 <slider bottom_delta="-11" can_edit_text="false" control_name="WaterNormalScaleZ" 118 initial_val="0.7" label="" left="259" max_val="10" min_val="0"
119 decimal_digits="1" follows="left" height="10" increment="0.1" 119 mouse_opaque="true" name="WaterNormalScaleY" show_text="true" value="1.0"
120 initial_val="0.7" label="" left="259" max_val="10" min_val="0" 120 width="200" />
121 mouse_opaque="true" name="WaterNormalScaleZ" show_text="true" value="1.0" 121 <slider bottom_delta="-11" can_edit_text="false" control_name="WaterNormalScaleZ"
122 width="200" /> 122 decimal_digits="1" follows="left" height="10" increment="0.1"
123 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 123 initial_val="0.7" label="" left="259" max_val="10" min_val="0"
124 bottom="-80" drop_shadow_visible="true" follows="left|top|right" 124 mouse_opaque="true" name="WaterNormalScaleZ" show_text="true" value="1.0"
125 font="SansSerif" h_pad="0" halign="left" height="16" 125 width="200" />
126 left="245" mouse_opaque="true" name="HDText" v_pad="0" width="355"> 126 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
127 Fresnel Scale 127 bottom="-80" drop_shadow_visible="true" follows="left|top|right"
128 </text> 128 font="SansSerif" h_pad="0" halign="left" height="16"
129 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" 129 left="245" mouse_opaque="true" name="HDText" v_pad="0" width="355">
130 left="395" name="WaterFresnelScaleHelp" width="18" /> 130 Fresnel Scale
131 <slider bottom_delta="-30" can_edit_text="false" control_name="WaterFresnelScale" 131 </text>
132 decimal_digits="2" follows="left" height="10" increment="0.01" 132 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
133 initial_val="0.7" label="" left="259" max_val="1" min_val="0" 133 left="395" name="WaterFresnelScaleHelp" width="18" />
134 mouse_opaque="true" name="WaterFresnelScale" show_text="true" value="1.0" 134 <slider bottom_delta="-30" can_edit_text="false" control_name="WaterFresnelScale"
135 width="200" /> 135 decimal_digits="2" follows="left" height="10" increment="0.01"
136 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 136 initial_val="0.7" label="" left="259" max_val="1" min_val="0"
137 bottom="-115" drop_shadow_visible="true" follows="left|top|right" 137 mouse_opaque="true" name="WaterFresnelScale" show_text="true" value="1.0"
138 font="SansSerif" h_pad="0" halign="left" height="16" 138 width="200" />
139 left="245" mouse_opaque="true" name="FresnelOffsetText" v_pad="0" 139 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
140 width="355"> 140 bottom="-115" drop_shadow_visible="true" follows="left|top|right"
141 Fresnel Offset 141 font="SansSerif" h_pad="0" halign="left" height="16"
142 </text> 142 left="245" mouse_opaque="true" name="FresnelOffsetText" v_pad="0"
143 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" 143 width="355">
144 left="395" name="WaterFresnelOffsetHelp" width="18" /> 144 Fresnel Offset
145 <slider bottom_delta="-30" can_edit_text="false" control_name="WaterFresnelOffset" 145 </text>
146 decimal_digits="2" follows="left" height="10" increment="0.01" 146 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
147 initial_val="0.7" label="" left="259" max_val="1" min_val="0" 147 left="395" name="WaterFresnelOffsetHelp" width="18" />
148 mouse_opaque="true" name="WaterFresnelOffset" show_text="true" value="1.0" 148 <slider bottom_delta="-30" can_edit_text="false" control_name="WaterFresnelOffset"
149 width="200" /> 149 decimal_digits="2" follows="left" height="10" increment="0.01"
150 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 150 initial_val="0.7" label="" left="259" max_val="1" min_val="0"
151 bottom="-20" drop_shadow_visible="true" follows="left|top|right" 151 mouse_opaque="true" name="WaterFresnelOffset" show_text="true" value="1.0"
152 font="SansSerif" h_pad="0" halign="left" height="16" 152 width="200" />
153 left="480" mouse_opaque="true" name="DensMultText" v_pad="0" width="355"> 153 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
154 Refract Scale Above 154 bottom="-20" drop_shadow_visible="true" follows="left|top|right"
155 </text> 155 font="SansSerif" h_pad="0" halign="left" height="16"
156 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" 156 left="480" mouse_opaque="true" name="DensMultText" v_pad="0" width="355">
157 left="630" name="WaterScaleAboveHelp" width="18" /> 157 Refract Scale Above
158 <slider bottom_delta="-30" can_edit_text="false" control_name="WaterScaleAbove" 158 </text>
159 decimal_digits="2" follows="left" height="10" increment="0.01" 159 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
160 initial_val="0.1" label="" left="494" max_val="1" min_val="0" 160 left="630" name="WaterScaleAboveHelp" width="18" />
161 mouse_opaque="true" name="WaterScaleAbove" show_text="true" value="1.0" 161 <slider bottom_delta="-30" can_edit_text="false" control_name="WaterScaleAbove"
162 width="200" /> 162 decimal_digits="2" follows="left" height="10" increment="0.01"
163 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 163 initial_val="0.1" label="" left="494" max_val="1" min_val="0"
164 bottom="-53" drop_shadow_visible="true" follows="left|top|right" 164 mouse_opaque="true" name="WaterScaleAbove" show_text="true" value="1.0"
165 font="SansSerif" h_pad="0" halign="left" height="16" 165 width="200" />
166 left="480" mouse_opaque="true" name="WaterScaleBelowText" v_pad="0" 166 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
167 width="355"> 167 bottom="-53" drop_shadow_visible="true" follows="left|top|right"
168 Refract Scale Below 168 font="SansSerif" h_pad="0" halign="left" height="16"
169 </text> 169 left="480" mouse_opaque="true" name="WaterScaleBelowText" v_pad="0"
170 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" 170 width="355">
171 left="630" name="WaterScaleBelowHelp" width="18" /> 171 Refract Scale Below
172 <slider bottom_delta="-30" can_edit_text="false" control_name="WaterScaleBelow" 172 </text>
173 decimal_digits="2" follows="left" height="10" increment="0.01" 173 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
174 initial_val="0" label="" left="494" max_val="1" min_val="0" 174 left="630" name="WaterScaleBelowHelp" width="18" />
175 mouse_opaque="true" name="WaterScaleBelow" show_text="true" value="0.0" 175 <slider bottom_delta="-30" can_edit_text="false" control_name="WaterScaleBelow"
176 width="200" /> 176 decimal_digits="2" follows="left" height="10" increment="0.01"
177 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 177 initial_val="0" label="" left="494" max_val="1" min_val="0"
178 bottom="-87" drop_shadow_visible="true" follows="left|top|right" 178 mouse_opaque="true" name="WaterScaleBelow" show_text="true" value="0.0"
179 font="SansSerif" h_pad="0" halign="left" height="16" 179 width="200" />
180 left="480" mouse_opaque="true" name="MaxAltText" v_pad="0" width="355"> 180 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
181 Blur Multiplier 181 bottom="-87" drop_shadow_visible="true" follows="left|top|right"
182 </text> 182 font="SansSerif" h_pad="0" halign="left" height="16"
183 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" 183 left="480" mouse_opaque="true" name="MaxAltText" v_pad="0" width="355">
184 left="630" name="WaterBlurMultiplierHelp" width="18" /> 184 Blur Multiplier
185 <slider bottom_delta="-30" can_edit_text="false" control_name="WaterBlurMult" 185 </text>
186 decimal_digits="3" follows="left" height="10" increment=".001" 186 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
187 initial_val="0" label="" left="494" max_val=".16" min_val="0" 187 left="630" name="WaterBlurMultiplierHelp" width="18" />
188 mouse_opaque="true" name="WaterBlurMult" show_text="true" value="0" 188 <slider bottom_delta="-30" can_edit_text="false" control_name="WaterBlurMult"
189 width="200" /> 189 decimal_digits="3" follows="left" height="10" increment=".001"
190 </panel> 190 initial_val="0" label="" left="494" max_val=".16" min_val="0"
191 <panel border="true" bottom="-240" follows="left|top|right|bottom" height="180" 191 mouse_opaque="true" name="WaterBlurMult" show_text="true" value="0"
192 label="Image" left="1" mouse_opaque="false" name="Waves" 192 width="200" />
193 width="698"> 193 </panel>
194 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 194 <panel border="true" bottom="-240" follows="left|top|right|bottom" height="180"
195 bottom="-20" drop_shadow_visible="true" follows="left|top|right" 195 label="Image" left="1" mouse_opaque="false" name="Waves"
196 font="SansSerif" h_pad="0" halign="left" height="16" 196 width="698">
197 left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355"> 197 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
198 Big Wave Direction 198 bottom="-20" drop_shadow_visible="true" follows="left|top|right"
199 </text> 199 font="SansSerif" h_pad="0" halign="left" height="16"
200 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" 200 left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">
201 left="155" name="WaterWave1Help" width="18" /> 201 Big Wave Direction
202 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 202 </text>
203 bottom="-37" drop_shadow_visible="true" follows="left|top|right" 203 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
204 font="SansSerifSmall" h_pad="0" halign="center" height="16" 204 left="155" name="WaterWave1Help" width="18" />
205 left="10" mouse_opaque="true" name="WaterWave1DirXText" v_pad="0" 205 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
206 width="10"> 206 bottom="-37" drop_shadow_visible="true" follows="left|top|right"
207 X 207 font="SansSerifSmall" h_pad="0" halign="center" height="16"
208 </text> 208 left="10" mouse_opaque="true" name="WaterWave1DirXText" v_pad="0"
209 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 209 width="10">
210 bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right" 210 X
211 font="SansSerifSmall" h_pad="0" halign="center" height="16" 211 </text>
212 left_delta="0" mouse_opaque="true" name="WaterWave1DirYText" v_pad="0" 212 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
213 width="10"> 213 bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
214 Y 214 font="SansSerifSmall" h_pad="0" halign="center" height="16"
215 </text> 215 left_delta="0" mouse_opaque="true" name="WaterWave1DirYText" v_pad="0"
216 <slider bottom="-50" can_edit_text="false" control_name="WaterWave1DirX" 216 width="10">
217 decimal_digits="2" follows="left" height="10" increment="0.01" 217 Y
218 initial_val="0.7" label="" left="24" max_val="4" min_val="-4" 218 </text>
219 mouse_opaque="true" name="WaterWave1DirX" show_text="true" value="0.7" 219 <slider bottom="-50" can_edit_text="false" control_name="WaterWave1DirX"
220 width="200" /> 220 decimal_digits="2" follows="left" height="10" increment="0.01"
221 <slider bottom_delta="-11" can_edit_text="false" control_name="WaterWave1DirY" 221 initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
222 decimal_digits="2" follows="left" height="10" increment="0.01" 222 mouse_opaque="true" name="WaterWave1DirX" show_text="true" value="0.7"
223 initial_val="0.7" label="" left="24" max_val="4" min_val="-4" 223 width="200" />
224 mouse_opaque="true" name="WaterWave1DirY" show_text="true" value="0.7" 224 <slider bottom_delta="-11" can_edit_text="false" control_name="WaterWave1DirY"
225 width="200" /> 225 decimal_digits="2" follows="left" height="10" increment="0.01"
226 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 226 initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
227 bottom="-70" drop_shadow_visible="true" follows="left|top|right" 227 mouse_opaque="true" name="WaterWave1DirY" show_text="true" value="0.7"
228 font="SansSerif" h_pad="0" halign="left" height="16" 228 width="200" />
229 left="10" mouse_opaque="true" name="BHText2" v_pad="0" width="355"> 229 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
230 Little Wave Direction 230 bottom="-70" drop_shadow_visible="true" follows="left|top|right"
231 </text> 231 font="SansSerif" h_pad="0" halign="left" height="16"
232 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" 232 left="10" mouse_opaque="true" name="BHText2" v_pad="0" width="355">
233 left="155" name="WaterWave2Help" width="18" /> 233 Little Wave Direction
234 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 234 </text>
235 bottom="-87" drop_shadow_visible="true" follows="left|top|right" 235 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
236 font="SansSerifSmall" h_pad="0" halign="center" height="16" 236 left="155" name="WaterWave2Help" width="18" />
237 left="10" mouse_opaque="true" name="WaterWave2DirXText" v_pad="0" 237 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
238 width="10"> 238 bottom="-87" drop_shadow_visible="true" follows="left|top|right"
239 X 239 font="SansSerifSmall" h_pad="0" halign="center" height="16"
240 </text> 240 left="10" mouse_opaque="true" name="WaterWave2DirXText" v_pad="0"
241 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 241 width="10">
242 bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right" 242 X
243 font="SansSerifSmall" h_pad="0" halign="center" height="16" 243 </text>
244 left_delta="0" mouse_opaque="true" name="WaterWave2DirYText" v_pad="0" 244 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
245 width="10"> 245 bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
246 Y 246 font="SansSerifSmall" h_pad="0" halign="center" height="16"
247 </text> 247 left_delta="0" mouse_opaque="true" name="WaterWave2DirYText" v_pad="0"
248 <slider bottom="-100" can_edit_text="false" control_name="WaterWave2DirX" 248 width="10">
249 decimal_digits="2" follows="left" height="10" increment="0.01" 249 Y
250 initial_val="0.7" label="" left="24" max_val="4" min_val="-4" 250 </text>
251 mouse_opaque="true" name="WaterWave2DirX" show_text="true" value="0.7" 251 <slider bottom="-100" can_edit_text="false" control_name="WaterWave2DirX"
252 width="200" /> 252 decimal_digits="2" follows="left" height="10" increment="0.01"
253 <slider bottom_delta="-11" can_edit_text="false" control_name="WaterWave2DirY" 253 initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
254 decimal_digits="2" follows="left" height="10" increment="0.01" 254 mouse_opaque="true" name="WaterWave2DirX" show_text="true" value="0.7"
255 initial_val="0.7" label="" left="24" max_val="4" min_val="-4" 255 width="200" />
256 mouse_opaque="true" name="WaterWave2DirY" show_text="true" value="0.7" 256 <slider bottom_delta="-11" can_edit_text="false" control_name="WaterWave2DirY"
257 width="200" /> 257 decimal_digits="2" follows="left" height="10" increment="0.01"
258 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 258 initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
259 bottom="-20" drop_shadow_visible="true" follows="left|top|right" 259 mouse_opaque="true" name="WaterWave2DirY" show_text="true" value="0.7"
260 font="SansSerif" h_pad="0" halign="left" height="16" 260 width="200" />
261 left="240" mouse_opaque="true" name="BHText3" v_pad="0" width="355"> 261 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
262 Normal Map 262 bottom="-20" drop_shadow_visible="true" follows="left|top|right"
263 </text> 263 font="SansSerif" h_pad="0" halign="left" height="16"
264 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" 264 left="240" mouse_opaque="true" name="BHText3" v_pad="0" width="355">
265 left="365" name="WaterNormalMapHelp" width="18" /> 265 Normal Map
266 <texture_picker bottom="-165" height="143" label="" left="250" name="WaterNormalMap" 266 </text>
267 width="128" /> 267 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
268 </panel> 268 left="365" name="WaterNormalMapHelp" width="18" />
269 </tab_container> 269 <texture_picker bottom="-165" height="143" label="" left="250" name="WaterNormalMap"
270 <string name="WLDefaultWaterNames"> 270 width="128" />
271 Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez 271 </panel>
272 </string> 272 </tab_container>
273</floater> 273 <string name="WLDefaultWaterNames">
274 Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
275 </string>
276</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_windlight_manager.xml b/linden/indra/newview/skins/default/xui/en-us/floater_windlight_manager.xml
new file mode 100644
index 0000000..9ef70c8
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_windlight_manager.xml
@@ -0,0 +1,35 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true"
3 can_resize="false" height="130" left="50" min_height="130"
4 min_width="300" mouse_opaque="true" name="WindLight send to server floater"
5 title="WindLight Manager"
6 width="300">
7 <button bottom="-50" enabled="true" font="SansSerif" halign="center" height="20"
8 label="This Parcel" label_selected="This Parcel" left="10"
9 mouse_opaque="true" name="this_parcel" scale_image="true" width="90" />
10 <button bottom="-50" enabled="true" font="SansSerif" halign="center" height="20"
11 label="All Parcels" label_selected="All Parcels" left_delta="95 "
12 mouse_opaque="true" name="all_parcels" scale_image="true" width="90" />
13 <button bottom="-50" enabled="true" font="SansSerif" halign="center" height="20"
14 label="This Region" label_selected="This Region" left_delta="95 "
15 mouse_opaque="true" name="this_region" scale_image="true" width="90" />
16 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
17 bottom="-75" drop_shadow_visible="true" follows="left|top|right"
18 font="SansSerif" h_pad="0" halign="left" height="16"
19 left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0"
20 width="110">
21 Settings:
22 </text>
23 <combo_box allow_text_entry="false" bottom="-77" follows="left|top" height="18"
24 left_delta="70" max_chars="20" mouse_opaque="true" name="WLSettingsCombo"
25 width="200" />
26 <button bottom="-125" enabled="true" font="SansSerif" halign="center" height="20"
27 label="Show" label_selected="Show" left="10"
28 mouse_opaque="true" name="show" scale_image="true" width="80" />
29 <button bottom="-125" enabled="true" font="SansSerif" halign="center" height="20"
30 label="Set to Current" label_selected="Set to Current" left="95"
31 mouse_opaque="true" name="set_to_current" scale_image="true" width="100" />
32 <button bottom="-125" enabled="true" font="SansSerif" halign="center" height="20"
33 label="Remove" label_selected="Remove" left="200"
34 mouse_opaque="true" name="remove" scale_image="true" width="80" />
35</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml b/linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml
index 4f5fc4a..c5e2c2a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml
@@ -32,6 +32,9 @@
32 <flyout_button_item value="save_disk_item" name="save_disk_item"> 32 <flyout_button_item value="save_disk_item" name="save_disk_item">
33 Save to Disk 33 Save to Disk
34 </flyout_button_item> 34 </flyout_button_item>
35 <flyout_button_item value="send_to_server_item" name="send_to_server_item">
36 Send to Server
37 </flyout_button_item>
35 </flyout_button> 38 </flyout_button>
36 <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20" 39 <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
37 label="Delete File" label_selected="Delete File" right="-10" 40 label="Delete File" label_selected="Delete File" right="-10"
@@ -211,6 +214,10 @@
211 initial_val="500" label="" left="494" max_val="4000" min_val="0" 214 initial_val="500" label="" left="494" max_val="4000" min_val="0"
212 mouse_opaque="true" name="WLMaxAltitude" show_text="true" value="4000" 215 mouse_opaque="true" name="WLMaxAltitude" show_text="true" value="4000"
213 width="205" /> 216 width="205" />
217 <button bottom="4" enabled="true" font="SansSerif" halign="center" height="20"
218 label="Day Cycle Editor" label_selected="Day Cycle Editor"
219 right="-10" mouse_opaque="true" name="WLDayCycleMenuButton"
220 scale_image="true" width="150" />
214 </panel> 221 </panel>
215 <panel border="true" bottom="-180" follows="left|top|right|bottom" height="160" 222 <panel border="true" bottom="-180" follows="left|top|right|bottom" height="160"
216 label="Lighting" left="1" mouse_opaque="true" 223 label="Lighting" left="1" mouse_opaque="true"
@@ -572,34 +579,54 @@
572 mouse_opaque="true" name="WLCloudScrollX" show_text="true" value="0.0" 579 mouse_opaque="true" name="WLCloudScrollX" show_text="true" value="0.0"
573 width="200" /> 580 width="200" />
574 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 581 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
575 bottom="-60" drop_shadow_visible="true" follows="left|top|right" 582 bottom="-52" drop_shadow_visible="true" follows="left|top|right"
576 font="SansSerif" h_pad="0" halign="left" height="16" 583 font="SansSerif" h_pad="0" halign="left" height="16"
577 left="480" mouse_opaque="true" name="WLCloudScrollYText" v_pad="0" 584 left="480" mouse_opaque="true" name="WLCloudScrollYText" v_pad="0"
578 width="355"> 585 width="355">
579 Cloud Scroll Y 586 Cloud Scroll Y
580 </text> 587 </text>
581 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" 588 <button bottom_delta="-2" follows="left|top" font="SansSerifSmall" height="18" label="?"
582 left="605" name="WLCloudScrollYHelp" width="18" /> 589 left="605" name="WLCloudScrollYHelp" width="18" />
583 <check_box control_name="WLCloudLockY" follows="left" font="SansSerifSmall" height="16" 590 <check_box control_name="WLCloudLockY" follows="left" font="SansSerifSmall" height="16"
584 initial_value="false" label="Lock" left="625" mouse_opaque="true" 591 initial_value="false" label="Lock" left="625" mouse_opaque="true"
585 name="WLCloudLockY" width="200" /> 592 name="WLCloudLockY" width="200" />
586 <slider bottom_delta="-15" can_edit_text="false" control_name="WLCloudScrollY" 593 <slider bottom_delta="-10" can_edit_text="false" control_name="WLCloudScrollY"
587 decimal_digits="2" follows="left" height="10" increment="0.01" 594 decimal_digits="2" follows="left" height="10" increment="0.01"
588 initial_val="0.5" label="" left="494" max_val="10" min_val="-10" 595 initial_val="0.5" label="" left="494" max_val="10" min_val="-10"
589 mouse_opaque="true" name="WLCloudScrollY" show_text="true" value="0.0" 596 mouse_opaque="true" name="WLCloudScrollY" show_text="true" value="0.0"
590 width="200" /> 597 width="200" />
591 <check_box bottom="-120" control_name="DrawClassicClouds" follows="left" 598 <check_box bottom="-102" control_name="DrawClassicClouds" follows="left"
592 font="SansSerifSmall" height="16" initial_value="false" 599 font="SansSerifSmall" height="16" initial_value="false"
593 label="Draw Classic Clouds" left="480" mouse_opaque="true" 600 label="Draw Classic Clouds" left="480" mouse_opaque="true"
594 name="DrawClassicClouds" width="200" /> 601 name="DrawClassicClouds" width="200" />
595 <button bottom="-102" follows="left|top" font="SansSerifSmall" height="18" label="?" 602 <button bottom="-85" follows="left|top" font="SansSerifSmall" height="18" label="?"
596 left="608" name="WLClassicCloudsHelp" width="18" /> 603 left="608" name="WLClassicCloudsHelp" width="18" />
604 <text bottom_delta="-19" type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
605 drop_shadow_visible="true" follows="left|top|right"
606 font="SansSerif" h_pad="0" halign="left" height="20"
607 left="480" mouse_opaque="true" name="WLCloudHeightText" v_pad="0"
608 width="355">
609 Classic Cloud Height
610 </text>
611 <slider bottom_delta="-27" can_edit_text="true" control_name="WLCloudHeight"
612 decimal_digits="0" follows="left" height="16" increment="1"
613 initial_val="192" label="" left="494" max_val="1000" min_val="0"
614 mouse_opaque="true" name="WLCloudHeight" show_text="true" value="192"
615 width="200" />
616 <text bottom_delta="0" type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
617 drop_shadow_visible="true" follows="left|top|right"
618 font="SansSerif" h_pad="0" halign="left" height="20"
619 left="480" mouse_opaque="true" name="WLCloudClassicRangeText" v_pad="0"
620 width="355">
621 Classic Cloud Range
622 </text>
623 <slider bottom_delta="-27" can_edit_text="true" control_name="WLCloudClassicRange"
624 decimal_digits="0" follows="left" height="16" increment="1 "
625 initial_val="48" label="" left="494" max_val="100" min_val="0"
626 mouse_opaque="true" name="WLCloudRange" show_text="true" value="48"
627 width="200" />
597 </panel> 628 </panel>
598 </tab_container> 629 </tab_container>
599 <button bottom="4" enabled="true" font="SansSerif" halign="center" height="20"
600 label="Day Cycle Editor" label_selected="Day Cycle Editor"
601 right="-10" mouse_opaque="true" name="WLDayCycleMenuButton"
602 scale_image="true" width="150" />
603 <string name="WLDefaultSkyNames"> 630 <string name="WLDefaultSkyNames">
604 A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality 631 A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
605 </string> 632 </string>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_windlight_remote_save.xml b/linden/indra/newview/skins/default/xui/en-us/floater_windlight_remote_save.xml
new file mode 100644
index 0000000..84c1d04
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_windlight_remote_save.xml
@@ -0,0 +1,123 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true"
3 can_resize="true" height="220" left="50" min_height="220"
4 min_width="300" mouse_opaque="true" name="WindLight send to server floater"
5 title="WindLight Send to Server"
6 width="300">
7 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
8 left="10" bottom="180" drop_shadow_visible="true" follows="left|top"
9 font="SansSerif" h_pad="0" halign="left" height="10"
10 mouse_opaque="true" name="label Type" v_pad="0" width="275">
11 WindLight Send to Server
12 </text>
13 <slider can_edit_text="true" control_name="max_altitude"
14 left="20" bottom="110"
15 decimal_digits="2" follows="left" height="18" increment="0.1"
16 initial_val="4096.0" label="Max Altitude" max_val="4096.001" min_val="0"
17 mouse_opaque="true" name="max_altitude" show_text="true" value="4096.0"
18 width="200" />
19 <button follows="left|top" font="SansSerifSmall" height="18" label="?"
20 left_delta="210" bottom="125" name="max_altitude_help" width="18" enabled="true" />
21
22 <slider can_edit_text="true" control_name="min_altitude"
23 left="20" bottom="80"
24 decimal_digits="2" follows="left" height="18" increment="0.1"
25 initial_val="1.0" label="Min Altitude" max_val="4096" min_val="0"
26 mouse_opaque="true" name="min_altitude" show_text="true" value="0"
27 width="200" />
28 <button follows="left|top" font="SansSerifSmall" height="18" label="?"
29 left_delta="210" bottom="95" name="min_altitude_help" width="18" enabled="true" />
30 <slider can_edit_text="true" control_name="Fade"
31 left="20" bottom="50"
32 decimal_digits="2" follows="left" height="18" increment="0.1"
33 initial_val="1.0" label="Fade" max_val="10" min_val="0"
34 mouse_opaque="true" name="Fade" show_text="true" value="1.0"
35 width="200" />
36 <button follows="left|top" font="SansSerifSmall" height="18" label="?"
37 left_delta="210" bottom="65" name="fade_help" width="18" />
38
39 <tab_container bottom="-220" follows="left|top" height="160" left="0"
40 mouse_opaque="false" name="WindLight_Setting_Types" tab_position="top" width="299">
41 <panel border="true" bottom="175" follows="left|top|right|bottom" height="160"
42 label="Region" left="1" mouse_opaque="false"
43 name="Region" width="698">
44 <check_box control_name="override_parcel" follows="left" font="SansSerifSmall" height="16"
45 left="20" bottom="30"
46 initial_value="false" label="Override Parcels" mouse_opaque="true"
47 name="override_parcel" width="200" enabled="true" />
48 <button follows="left|top" font="SansSerifSmall" height="18" label="?"
49 left_delta="210" bottom="45" name="override_parcel_help" width="18" enabled="true" />
50
51 <button follows="top|right" font="SansSerif" halign="center"
52 right="-10" bottom="20"
53 height="20" label="Send" label_selected="Send"
54 mouse_opaque="true" name="button_region_send_to_server" scale_image="TRUE" width="78" />
55 </panel>
56 <panel border="true" bottom="175" follows="left|top|right|bottom" height="160"
57 label="Parcel" left="1" mouse_opaque="false"
58 name="Parcel" width="698">
59
60 <!--<slider can_edit_text="true" control_name="max_altitude"
61 left="20" bottom="110"
62 decimal_digits="2" follows="left" height="18" increment="0.1"
63 initial_val="4096.0" label="Max Altitude" max_val="4096.001" min_val="0"
64 mouse_opaque="true" name="max_altitude" show_text="true" value="4096.0"
65 width="200" />
66 <button follows="left|top" font="SansSerifSmall" height="18" label="?"
67 left_delta="210" bottom="125" name="max_altitude_help" width="18" enabled="true" />
68
69 <slider can_edit_text="true" control_name="min_altitude"
70 left="20" bottom="80"
71 decimal_digits="2" follows="left" height="18" increment="0.1"
72 initial_val="1.0" label="Min Altitude" max_val="4096" min_val="0"
73 mouse_opaque="true" name="min_altitude" show_text="true" value="0"
74 width="200" />
75 <button follows="left|top" font="SansSerifSmall" height="18" label="?"
76 left_delta="210" bottom="95" name="min_altitude_help" width="18" enabled="true" />
77
78 <slider can_edit_text="true" control_name="Fade"
79 left="20" bottom="50"
80 decimal_digits="2" follows="left" height="18" increment="0.1"
81 initial_val="1.0" label="Fade" max_val="10" min_val="0"
82 mouse_opaque="true" name="Fade" show_text="true" value="1.0"
83 width="200" />
84 <button follows="left|top" font="SansSerifSmall" height="18" label="?"
85 left_delta="210" bottom="65" name="fade_help" width="18" />-->
86
87 <button follows="top|right" font="SansSerif" halign="center"
88 right="-10" bottom="20" height="20" label="Send"
89 mouse_opaque="true" name="button_parcel_send_to_server" width="78" />
90 </panel>
91 <!--<panel border="true" bottom="175" follows="left|top|right|bottom" height="160"
92 label="Area" left="1" mouse_opaque="false"
93 name="Area" width="698">
94
95 <slider can_edit_text="true" control_name="Max Altitude"
96 left="20" bottom="110"
97 decimal_digits="2" follows="left" height="18" increment="0.1"
98 initial_val="4096.0" label="Max Altitude" max_val="4096.001" min_val="0"
99 mouse_opaque="true" name="Max Altitude" show_text="true" value="4096.0"
100 width="200" />
101 <slider can_edit_text="true" control_name="Min Altitude"
102 left="20" bottom="80"
103 decimal_digits="2" follows="left" height="18" increment="0.1"
104 initial_val="1.0" label="Min Altitude" max_val="4096" min_val="0"
105 mouse_opaque="true" name="Min Altitude" show_text="true" value="0"
106 width="200" />
107
108 <slider can_edit_text="true" control_name="Fade"
109 left="20" bottom="50"
110 decimal_digits="2" follows="left" height="18" increment="0.1"
111 initial_val="1.0" label="Fade" max_val="10" min_val="0"
112 mouse_opaque="true" name="Fade" show_text="true" value="1.0"
113 width="200" />
114 <button follows="left|top" font="SansSerifSmall" height="18" label="?"
115 left_delta="210" bottom="65" name="fade_help" width="18" />
116
117 <button follows="top|right" font="SansSerif" halign="center"
118 right="-10" bottom="20"
119 height="20" label="Send" label_selected="Send"
120 mouse_opaque="true" name="button send to server" scale_image="TRUE" width="78" />
121 </panel>-->
122 </tab_container>
123</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml
index 389efb5..daf217e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml
@@ -1,183 +1,183 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true" 2<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
3 height="711" min_height="520" min_width="410" name="worldmap" 3 height="711" min_height="520" min_width="410" name="worldmap"
4 rect_control="FloaterWorldMapRect2" title="World Map" width="1243"> 4 rect_control="FloaterWorldMapRect2" title="World Map" width="1243">
5 <tab_container bottom="-701" follows="left|top|right|bottom" height="681" left="15" 5 <tab_container bottom="-701" follows="left|top|right|bottom" height="681" left="15"
6 mouse_opaque="false" name="maptab" tab_position="top" width="995"> 6 mouse_opaque="false" name="maptab" tab_position="top" width="995">
7 <panel bottom="-680" follows="left|top|right|bottom" height="664" label="Objects" 7 <panel bottom="-680" follows="left|top|right|bottom" height="664" label="Objects"
8 left="1" mouse_opaque="true" name="objects_mapview" width="993" /> 8 left="1" mouse_opaque="true" name="objects_mapview" width="993" />
9 <panel bottom="-680" follows="left|top|right|bottom" height="664" label="Terrain" 9 <panel bottom="-680" follows="left|top|right|bottom" height="664" label="Terrain"
10 left="1" mouse_opaque="true" name="terrain_mapview" width="993" /> 10 left="1" mouse_opaque="true" name="terrain_mapview" width="993" />
11 </tab_container> 11 </tab_container>
12 <icon bottom="-50" color="1, 1, 1, 1" follows="top|right" height="16" 12 <icon bottom="-50" color="1, 1, 1, 1" follows="top|right" height="16"
13 image_name="map_avatar_16.tga" left="1013" mouse_opaque="true" name="self" 13 image_name="map_avatar_16.tga" left="1013" mouse_opaque="true" name="self"
14 width="16" /> 14 width="16" />
15 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 15 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
16 bottom="-50" drop_shadow_visible="true" follows="top|right" 16 bottom="-50" drop_shadow_visible="true" follows="top|right"
17 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20" 17 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
18 mouse_opaque="true" name="you_label" v_pad="0" width="145"> 18 mouse_opaque="true" name="you_label" v_pad="0" width="145">
19 You 19 You
20 </text> 20 </text>
21 <icon bottom="-50" color="1, 1, 1, 1" follows="top|right" height="16" 21 <icon bottom="-50" color="1, 1, 1, 1" follows="top|right" height="16"
22 image_name="map_home.tga" left="1083" mouse_opaque="true" name="home" 22 image_name="map_home.tga" left="1083" mouse_opaque="true" name="home"
23 width="16" /> 23 width="16" />
24 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 24 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
25 bottom="-50" drop_shadow_visible="true" follows="top|right" 25 bottom="-50" drop_shadow_visible="true" follows="top|right"
26 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20" 26 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
27 mouse_opaque="true" name="home_label" v_pad="0" width="145"> 27 mouse_opaque="true" name="home_label" v_pad="0" width="145">
28 Home 28 Home
29 </text> 29 </text>
30 <icon bottom="-70" color="0.5, 0.25, 1, 1" follows="top|right" height="16" 30 <icon bottom="-70" color="0.5, 0.25, 1, 1" follows="top|right" height="16"
31 image_name="legend.tga" left="1013" mouse_opaque="true" name="square2" 31 image_name="legend.tga" left="1013" mouse_opaque="true" name="square2"
32 width="16" /> 32 width="16" />
33 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 33 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
34 bottom="-70" drop_shadow_visible="true" follows="top|right" 34 bottom="-70" drop_shadow_visible="true" follows="top|right"
35 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20" 35 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
36 mouse_opaque="true" name="auction_label" v_pad="0" width="145"> 36 mouse_opaque="true" name="auction_label" v_pad="0" width="145">
37 Auction 37 Auction
38 </text> 38 </text>
39 <icon bottom="-70" color="1, 1, 0.25, 1" follows="top|right" height="16" 39 <icon bottom="-70" color="1, 1, 0.25, 1" follows="top|right" height="16"
40 image_name="legend.tga" left="1083" mouse_opaque="true" name="square" 40 image_name="legend.tga" left="1083" mouse_opaque="true" name="square"
41 width="16" /> 41 width="16" />
42 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 42 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
43 bottom="-70" drop_shadow_visible="true" follows="top|right" 43 bottom="-70" drop_shadow_visible="true" follows="top|right"
44 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20" 44 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
45 mouse_opaque="true" name="land_for_sale_label" v_pad="0" width="145"> 45 mouse_opaque="true" name="land_for_sale_label" v_pad="0" width="145">
46 Land For Sale 46 Land For Sale
47 </text> 47 </text>
48 <button bottom="-50" follows="top|right" font="SansSerifSmall" halign="center" 48 <button bottom="-50" follows="top|right" font="SansSerifSmall" halign="center"
49 height="16" label="Go Home" label_selected="Go Home" left="1150" 49 height="16" label="Go Home" label_selected="Go Home" left="1150"
50 mouse_opaque="true" name="Go Home" tool_tip="Teleport to your home" 50 mouse_opaque="true" name="Go Home" tool_tip="Teleport to your home"
51 width="88" /> 51 width="88" />
52 <icon bottom="-92" color="0, 1, 0, 1" follows="top|right" height="8" 52 <icon bottom="-92" color="0, 1, 0, 1" follows="top|right" height="8"
53 image_name="map_avatar_8.tga" left="1017" mouse_opaque="true" name="person" 53 image_name="map_avatar_8.tga" left="1017" mouse_opaque="true" name="person"
54 width="8" /> 54 width="8" />
55 <check_box bottom="-96" control_name="MapShowPeople" follows="top|right" 55 <check_box bottom="-96" control_name="MapShowPeople" follows="top|right"
56 font="SansSerifSmall" height="16" initial_value="false" label="Resident" 56 font="SansSerifSmall" height="16" initial_value="false" label="Resident"
57 left_delta="16" mouse_opaque="true" name="people_chk" width="110" /> 57 left_delta="16" mouse_opaque="true" name="people_chk" width="110" />
58 <icon bottom="-116" color="1, 1, 1, 1" follows="top|right" height="16" 58 <icon bottom="-116" color="1, 1, 1, 1" follows="top|right" height="16"
59 image_name="map_infohub.tga" left="1013" mouse_opaque="true" name="infohub" 59 image_name="map_infohub.tga" left="1013" mouse_opaque="true" name="infohub"
60 width="16" /> 60 width="16" />
61 <check_box bottom="-116" control_name="MapShowInfohubs" follows="top|right" 61 <check_box bottom="-116" control_name="MapShowInfohubs" follows="top|right"
62 font="SansSerifSmall" height="16" initial_value="false" label="Infohub" 62 font="SansSerifSmall" height="16" initial_value="false" label="Infohub"
63 left_delta="20" mouse_opaque="true" name="infohub_chk" width="110" /> 63 left_delta="20" mouse_opaque="true" name="infohub_chk" width="110" />
64 <icon bottom="-136" color="1, 1, 1, 1" follows="top|right" height="16" 64 <icon bottom="-136" color="1, 1, 1, 1" follows="top|right" height="16"
65 image_name="map_telehub.tga" left="1013" mouse_opaque="true" name="telehub" 65 image_name="map_telehub.tga" left="1013" mouse_opaque="true" name="telehub"
66 width="16" /> 66 width="16" />
67 <check_box bottom="-136" control_name="MapShowTelehubs" follows="top|right" 67 <check_box bottom="-136" control_name="MapShowTelehubs" follows="top|right"
68 font="SansSerifSmall" height="16" initial_value="false" label="Telehub" 68 font="SansSerifSmall" height="16" initial_value="false" label="Telehub"
69 left_delta="20" mouse_opaque="true" name="telehubchk" width="110" /> 69 left_delta="20" mouse_opaque="true" name="telehubchk" width="110" />
70 <icon bottom="-156" color="1, 1, 1, 1" follows="top|right" height="16" 70 <icon bottom="-156" color="1, 1, 1, 1" follows="top|right" height="16"
71 image_name="icon_for_sale.tga" left="1013" mouse_opaque="true" 71 image_name="icon_for_sale.tga" left="1013" mouse_opaque="true"
72 name="landforsale" width="16" /> 72 name="landforsale" width="16" />
73 <check_box bottom="-156" control_name="MapShowLandForSale" follows="top|right" 73 <check_box bottom="-156" control_name="MapShowLandForSale" follows="top|right"
74 font="SansSerifSmall" height="16" initial_value="false" label="Land for Sale" 74 font="SansSerifSmall" height="16" initial_value="false" label="Land for Sale"
75 left_delta="20" mouse_opaque="true" name="land_for_sale_chk" width="110" /> 75 left_delta="20" mouse_opaque="true" name="land_for_sale_chk" width="110" />
76 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 76 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
77 bottom="-96" drop_shadow_visible="true" follows="top|right" 77 bottom="-96" drop_shadow_visible="true" follows="top|right"
78 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="1139" 78 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="1139"
79 mouse_opaque="true" name="events_label" v_pad="0" width="145"> 79 mouse_opaque="true" name="events_label" v_pad="0" width="145">
80 Events: 80 Events:
81 </text> 81 </text>
82 <icon bottom="-116" color="1, 1, 1, 1" follows="top|right" height="16" 82 <icon bottom="-116" color="1, 1, 1, 1" follows="top|right" height="16"
83 image_name="map_event.tga" left="1151" mouse_opaque="true" name="event" 83 image_name="map_event.tga" left="1151" mouse_opaque="true" name="event"
84 width="16" /> 84 width="16" />
85 <check_box bottom="-116" control_name="MapShowEvents" follows="top|right" 85 <check_box bottom="-116" control_name="MapShowEvents" follows="top|right"
86 font="SansSerifSmall" height="16" initial_value="false" label="PG" 86 font="SansSerifSmall" height="16" initial_value="false" label="PG"
87 left_delta="20" mouse_opaque="true" name="event_chk" width="55" /> 87 left_delta="20" mouse_opaque="true" name="event_chk" width="55" />
88 <icon bottom="-136" color="1, 1, 1, 1" follows="top|right" height="16" 88 <icon bottom="-136" color="1, 1, 1, 1" follows="top|right" height="16"
89 image_name="map_event_mature.tga" left="1151" mouse_opaque="true" 89 image_name="map_event_mature.tga" left="1151" mouse_opaque="true"
90 name="events_mature_icon" width="16" /> 90 name="events_mature_icon" width="16" />
91 <check_box bottom="-136" control_name="ShowMatureEvents" follows="top|right" 91 <check_box bottom="-136" control_name="ShowMatureEvents" follows="top|right"
92 font="SansSerifSmall" height="16" initial_value="true" label="Mature" 92 font="SansSerifSmall" height="16" initial_value="true" label="Mature"
93 left_delta="20" mouse_opaque="true" name="event_mature_chk" width="55" /> 93 left_delta="20" mouse_opaque="true" name="event_mature_chk" width="55" />
94 <icon bottom="-156" color="1, 1, 1, 1" follows="top|right" height="16" 94 <icon bottom="-156" color="1, 1, 1, 1" follows="top|right" height="16"
95 image_name="map_event_adult.tga" left="1151" mouse_opaque="true" 95 image_name="map_event_adult.tga" left="1151" mouse_opaque="true"
96 name="events_adult_icon" width="16" /> 96 name="events_adult_icon" width="16" />
97 <check_box bottom="-156" control_name="ShowAdultEvents" follows="top|right" 97 <check_box bottom="-156" control_name="ShowAdultEvents" follows="top|right"
98 font="SansSerifSmall" height="16" initial_value="false" label="Adult" 98 font="SansSerifSmall" height="16" initial_value="false" label="Adult"
99 left_delta="20" mouse_opaque="true" name="event_adult_chk" width="55" /> 99 left_delta="20" mouse_opaque="true" name="event_adult_chk" width="55" />
100 <icon bottom="-180" color="0.5, 0, 0, 1" follows="top|right" height="16" 100 <icon bottom="-180" color="0.5, 0, 0, 1" follows="top|right" height="16"
101 image_name="map_track_16.tga" left="1013" mouse_opaque="true" 101 image_name="map_track_16.tga" left="1013" mouse_opaque="true"
102 name="avatar_icon" width="16" /> 102 name="avatar_icon" width="16" />
103 <combo_box allow_text_entry="true" bottom_delta="0" follows="top|right" height="20" 103 <combo_box allow_text_entry="true" bottom_delta="0" follows="top|right" height="20"
104 label="Online Friends" left_delta="20" max_chars="60" mouse_opaque="true" 104 label="Online Friends" left_delta="20" max_chars="60" mouse_opaque="true"
105 name="friend combo" tool_tip="Friend to Show on Map" width="202"> 105 name="friend combo" tool_tip="Friend to Show on Map" width="202">
106 <combo_item name="none_selected" value="None"> 106 <combo_item name="none_selected" value="None">
107 Online Friends 107 Online Friends
108 </combo_item> 108 </combo_item>
109 </combo_box> 109 </combo_box>
110 <icon bottom_delta="-25" color="0.5, 0, 0, 1" follows="top|right" height="16" 110 <icon bottom_delta="-25" color="0.5, 0, 0, 1" follows="top|right" height="16"
111 image_name="map_track_16.tga" left="1013" mouse_opaque="true" 111 image_name="map_track_16.tga" left="1013" mouse_opaque="true"
112 name="landmark_icon" width="16" /> 112 name="landmark_icon" width="16" />
113 <combo_box allow_text_entry="true" bottom_delta="0" follows="top|right" height="20" 113 <combo_box allow_text_entry="true" bottom_delta="0" follows="top|right" height="20"
114 label="Landmarks" left_delta="20" max_chars="64" mouse_opaque="true" 114 label="Landmarks" left_delta="20" max_chars="64" mouse_opaque="true"
115 name="landmark combo" tool_tip="Landmark to Show on Map" width="202"> 115 name="landmark combo" tool_tip="Landmark to Show on Map" width="202">
116 <combo_item name="none_selected" value="None"> 116 <combo_item name="none_selected" value="None">
117 Landmarks 117 Landmarks
118 </combo_item> 118 </combo_item>
119 </combo_box> 119 </combo_box>
120 <icon bottom_delta="-25" color="0.5, 0, 0, 1" follows="top|right" height="16" 120 <icon bottom_delta="-25" color="0.5, 0, 0, 1" follows="top|right" height="16"
121 image_name="map_track_16.tga" left="1013" mouse_opaque="true" 121 image_name="map_track_16.tga" left="1013" mouse_opaque="true"
122 name="location_icon" width="16" /> 122 name="location_icon" width="16" />
123 <line_editor bottom_delta="0" follows="top|right" height="20" label="Search by Region Name" 123 <line_editor bottom_delta="0" follows="top|right" height="20" label="Search by Region Name"
124 left_delta="20" name="location" select_on_focus="true" 124 left_delta="20" name="location" select_on_focus="true"
125 tool_tip="Type the name of a region" width="140" /> 125 tool_tip="Type the name of a region" width="140" />
126 <button bottom_delta="0" follows="top|right" font="SansSerif" halign="center" 126 <button bottom_delta="0" follows="top|right" font="SansSerif" halign="center"
127 height="20" label="Search" left_delta="145" mouse_opaque="true" 127 height="20" label="Search" left_delta="145" mouse_opaque="true"
128 name="DoSearch" tool_tip="Search for region" width="60" /> 128 name="DoSearch" tool_tip="Search for region" width="60" />
129 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 129 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
130 bottom_delta="-20" drop_shadow_visible="true" follows="top|right" 130 bottom_delta="-20" drop_shadow_visible="true" follows="top|right"
131 font="SansSerif" h_pad="0" halign="left" height="16" left="1013" 131 font="SansSerif" h_pad="0" halign="left" height="16" left="1013"
132 mouse_opaque="true" name="search_label" v_pad="0" width="222"> 132 mouse_opaque="true" name="search_label" v_pad="0" width="222">
133 Search Results: 133 Search Results:
134 </text> 134 </text>
135 <scroll_list background_visible="true" bottom_delta="-326" draw_border="true" 135 <scroll_list background_visible="true" bottom_delta="-326" draw_border="true"
136 draw_stripes="false" 136 draw_stripes="false"
137 follows="top|right|bottom" height="320" left="1013" multi_select="false" 137 follows="top|right|bottom" height="320" left="1013" multi_select="false"
138 name="search_results" width="222"> 138 name="search_results" width="222">
139 <column label="" name="icon" width="16" /> 139 <column label="" name="icon" width="16" />
140 <column label="" name="sim_name" width="206" /> 140 <column label="" name="sim_name" width="206" />
141 </scroll_list> 141 </scroll_list>
142 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 142 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
143 bottom_delta="-20" drop_shadow_visible="true" follows="bottom|right" 143 bottom_delta="-20" drop_shadow_visible="true" follows="bottom|right"
144 font="SansSerif" h_pad="0" halign="left" height="16" left="1013" 144 font="SansSerif" h_pad="0" halign="left" height="16" left="1013"
145 mouse_opaque="true" name="location_label" v_pad="0" width="98"> 145 mouse_opaque="true" name="location_label" v_pad="0" width="98">
146 Location: 146 Location:
147 </text> 147 </text>
148 <spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16" 148 <spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16"
149 increment="1" initial_val="128" left="1090" max_val="255" min_val="0" 149 increment="1" initial_val="128" left="1090" max_val="99999" min_val="0"
150 mouse_opaque="true" name="spin x" 150 mouse_opaque="true" name="spin x"
151 tool_tip="X coordinate of location to show on map" width="48" /> 151 tool_tip="X coordinate of location to show on map" width="48" />
152 <spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16" 152 <spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16"
153 increment="1" initial_val="128" left_delta="50" max_val="255" min_val="0" 153 increment="1" initial_val="128" left_delta="50" max_val="99999" min_val="0"
154 mouse_opaque="true" name="spin y" 154 mouse_opaque="true" name="spin y"
155 tool_tip="Y coordinate of location to show on map" width="48" /> 155 tool_tip="Y coordinate of location to show on map" width="48" />
156 <spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16" 156 <spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16"
157 increment="1" initial_val="0" left_delta="50" max_val="4096" min_val="0" 157 increment="1" initial_val="0" left_delta="50" max_val="4096" min_val="0"
158 mouse_opaque="true" name="spin z" 158 mouse_opaque="true" name="spin z"
159 tool_tip="Z coordinate of location to show on map" width="48" /> 159 tool_tip="Z coordinate of location to show on map" width="48" />
160 <button bottom="-625" follows="right|bottom" font="SansSerif" halign="center" 160 <button bottom="-625" follows="right|bottom" font="SansSerif" halign="center"
161 height="20" label="Teleport" label_selected="Teleport" left="-230" 161 height="20" label="Teleport" label_selected="Teleport" left="-230"
162 mouse_opaque="true" name="Teleport" 162 mouse_opaque="true" name="Teleport"
163 tool_tip="Teleport to selected location" width="90" /> 163 tool_tip="Teleport to selected location" width="90" />
164 <button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center" 164 <button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
165 height="20" label="Show Destination" label_selected="Show Destination" 165 height="20" label="Show Destination" label_selected="Show Destination"
166 left_delta="100" mouse_opaque="true" name="Show Destination" 166 left_delta="100" mouse_opaque="true" name="Show Destination"
167 tool_tip="Center map on selected location" width="125" /> 167 tool_tip="Center map on selected location" width="125" />
168 <button bottom_delta="-24" follows="right|bottom" font="SansSerif" halign="center" 168 <button bottom_delta="-24" follows="right|bottom" font="SansSerif" halign="center"
169 height="20" label="Clear" label_selected="Clear" left="-230" 169 height="20" label="Clear" label_selected="Clear" left="-230"
170 mouse_opaque="true" name="Clear" tool_tip="Stop tracking" width="90" /> 170 mouse_opaque="true" name="Clear" tool_tip="Stop tracking" width="90" />
171 <button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center" 171 <button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
172 height="20" label="Show My Location" label_selected="Show My Location" 172 height="20" label="Show My Location" label_selected="Show My Location"
173 left_delta="100" mouse_opaque="true" name="Show My Location" 173 left_delta="100" mouse_opaque="true" name="Show My Location"
174 tool_tip="Center map on your avatar&apos;s location" width="125" /> 174 tool_tip="Center map on your avatar&apos;s location" width="125" />
175 <button bottom_delta="-24" enabled="false" follows="bottom|right" font="SansSerif" 175 <button bottom_delta="-24" enabled="false" follows="bottom|right" font="SansSerif"
176 height="20" label="Copy SLURL to clipboard" left="-230" name="copy_slurl" 176 height="20" label="Copy SLURL to clipboard" left="-230" name="copy_slurl"
177 tool_tip="Copies current location as SLURL to be used on the web." 177 tool_tip="Copies current location as SLURL to be used on the web."
178 width="222" /> 178 width="222" />
179 <slider bottom="-697" can_edit_text="false" decimal_digits="3" follows="right|bottom" 179 <slider bottom="-697" can_edit_text="false" decimal_digits="3" follows="right|bottom"
180 height="16" increment="0.2" initial_val="48.5029" label="Zoom" left="-230" 180 height="16" increment="0.2" initial_val="48.5029" label="Zoom" left="-230"
181 max_val="0" min_val="-8" mouse_opaque="true" name="zoom slider" 181 max_val="0" min_val="-8" mouse_opaque="true" name="zoom slider"
182 show_text="false" value="48.5029" width="222" /> 182 show_text="false" value="48.5029" width="222" />
183</floater> 183</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_attachment.xml b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_attachment.xml
index 18bedd0..35f3037 100644
--- a/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_attachment.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_attachment.xml
@@ -1,23 +1,23 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<pie_menu name="Attachment Pie"> 2<pie_menu name="Attachment Pie">
3 <menu_item_call enabled="false" label="Drop" mouse_opaque="true" name="Drop"> 3 <menu_item_call enabled="false" label="Drop" mouse_opaque="true" name="Drop">
4 <on_click function="Attachment.Drop" /> 4 <on_click function="Attachment.Drop" />
5 <on_enable function="Attachment.EnableDrop" /> 5 <on_enable function="Attachment.EnableDrop" />
6 </menu_item_call> 6 </menu_item_call>
7 <menu_item_separator /> 7 <menu_item_separator />
8 <menu_item_separator /> 8 <menu_item_separator />
9 <menu_item_separator /> 9 <menu_item_separator />
10 <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect"> 10 <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
11 <on_click function="Object.Inspect" /> 11 <on_click function="Object.Inspect" />
12 <on_enable function="Object.EnableInspect" /> 12 <on_enable function="Object.EnableInspect" />
13 </menu_item_call> 13 </menu_item_call>
14 <menu_item_separator /> 14 <menu_item_separator />
15 <menu_item_call enabled="false" label="Detach" mouse_opaque="true" name="Detach"> 15 <menu_item_call enabled="false" label="Detach" mouse_opaque="true" name="Detach">
16 <on_click function="Attachment.Detach" /> 16 <on_click function="Attachment.Detach" />
17 <on_enable function="Attachment.EnableDetach" /> 17 <on_enable function="Attachment.EnableDetach" />
18 </menu_item_call> 18 </menu_item_call>
19 <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit"> 19 <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit">
20 <on_click function="Object.Edit" /> 20 <on_click function="Object.Edit" />
21 <on_enable function="EnableEdit" /> 21 <on_enable function="EnableEdit" />
22 </menu_item_call> 22 </menu_item_call>
23</pie_menu> 23</pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 0ac7401..b98ff7c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -3663,6 +3663,90 @@ Default: off
3663 3663
3664<notification 3664<notification
3665 icon="alertmodal.tga" 3665 icon="alertmodal.tga"
3666 label="Force Draw Distance"
3667 name="HelpForceDrawDistance"
3668 type="alertmodal">
3669If this box is checked, draw distance will be locked for all people in the sim. Note: This will lag people on older machines. PLEASE think before setting this setting.
3670
3671Default: off
3672</notification>
3673
3674<notification
3675 icon="alertmodal.tga"
3676 label="Max Inventory Items To Transfer"
3677 name="HelpMaxInventoryItemsTransfer"
3678 type="alertmodal">
3679This box controls how many objects can be transfered between clients at a time. -1 sets no limit on the amount of objects. Default Second Life setting is 42.
3680
3681Default: -1
3682</notification>
3683<notification
3684 icon="alertmodal.tga"
3685 label="Max Groups"
3686 name="HelpMaxGroups"
3687 type="alertmodal">
3688This box controls how many groups an agent can join. -1 sets no limit on the amount of groups.
3689
3690Default: -1
3691</notification>
3692 <notification
3693 icon="alertmodal.tga"
3694 label="Render Water"
3695 name="HelpRenderWater"
3696 type="alertmodal">
3697 If this box is checked, water will not be shown for users in this sim.
3698
3699 Default: -1
3700 </notification>
3701<notification
3702 icon="alertmodal.tga"
3703 label="Allow Minimap"
3704 name="HelpAllowMinimap"
3705 type="alertmodal">
3706If this box is checked, the minimap will be disabled for users in this sim.
3707
3708Default: on
3709</notification>
3710<notification
3711 icon="alertmodal.tga"
3712 label="Allow Minimap"
3713 name="HelpAllowPhysicalPrims"
3714 type="alertmodal">
3715If this box is checked, physical prims will be allowed to be created in this sim.
3716
3717Default: on
3718</notification>
3719<notification
3720 icon="alertmodal.tga"
3721 label="Enable Teen Mode"
3722 name="HelpEnableTeenMode"
3723 type="alertmodal">
3724If this box is checked, all avatars will be forced to wear underwear and will not be able to take it off.
3725
3726Default: off
3727</notification>
3728<notification
3729 icon="alertmodal.tga"
3730 label="Show Tags"
3731 name="HelpShowTags"
3732 type="alertmodal">
3733This box controls how avatar name tags are shown in this sim. 2 sets tags to always be shown. 1 sets tags to disappear after some time. 0 blocks the viewing of name tags.
3734
3735Default: 2
3736</notification>
3737<notification
3738 icon="alertmodal.tga"
3739 label="Allow Parcel WindLight"
3740 name="HelpAllowParcelWindLight"
3741 type="alertmodal">
3742If this box is checked, setting WindLight settings in parcels will be enabled.
3743
3744Default: on
3745</notification>
3746
3747
3748<notification
3749 icon="alertmodal.tga"
3666 label="Bulk Change Content Permissions" 3750 label="Bulk Change Content Permissions"
3667 name="HelpBulkPermission" 3751 name="HelpBulkPermission"
3668 type="alertmodal"> 3752 type="alertmodal">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index 2360e6b..0df65e7 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -138,11 +138,11 @@
138 bottom_delta="-6" drop_shadow_visible="true" follows="left|top" 138 bottom_delta="-6" drop_shadow_visible="true" follows="left|top"
139 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0" 139 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
140 mouse_opaque="true" name="About:" v_pad="0" width="170"> 140 mouse_opaque="true" name="About:" v_pad="0" width="170">
141 About (500 chars): 141 About (8196 chars):
142 </text> 142 </text>
143 <text_editor bottom_delta="-137" embedded_items="false" 143 <text_editor bottom_delta="-137" embedded_items="false"
144 enabled="true" follows="left|top" font="SansSerifSmall" height="137" 144 enabled="true" follows="left|top" font="SansSerifSmall" height="137"
145 is_unicode="false" left_delta="0" max_length="511" mouse_opaque="true" 145 is_unicode="false" left_delta="0" max_length="8196" mouse_opaque="true"
146 name="about" width="235" word_wrap="true" spell_check="true" /> 146 name="about" width="235" word_wrap="true" spell_check="true" />
147 147
148 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 148 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -350,11 +350,11 @@
350 bottom_delta="-8" drop_shadow_visible="true" follows="left|top" 350 bottom_delta="-8" drop_shadow_visible="true" follows="left|top"
351 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12" 351 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
352 mouse_opaque="true" name="Info:" v_pad="0" width="161"> 352 mouse_opaque="true" name="Info:" v_pad="0" width="161">
353 Info (250 chars): 353 Info (8196 chars):
354 </text> 354 </text>
355 <text_editor bottom_delta="-179" embedded_items="false" 355 <text_editor bottom_delta="-179" embedded_items="false"
356 enabled="true" follows="left|top" font="SansSerifSmall" height="178" 356 enabled="true" follows="left|top" font="SansSerifSmall" height="178"
357 is_unicode="false" left="12" max_length="254" mouse_opaque="false" 357 is_unicode="false" left="12" max_length="8196" mouse_opaque="false"
358 name="about" width="378" word_wrap="true" spell_check="true" /> 358 name="about" width="378" word_wrap="true" spell_check="true" />
359 </panel> 359 </panel>
360 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466" 360 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
@@ -372,7 +372,7 @@
372 </text> 372 </text>
373 <text_editor bottom_delta="-260" embedded_items="false" enabled="true" follows="left|top" 373 <text_editor bottom_delta="-260" embedded_items="false" enabled="true" follows="left|top"
374 font="SansSerif" height="256" is_unicode="false" left="10" 374 font="SansSerif" height="256" is_unicode="false" left="10"
375 max_length="1023" mouse_opaque="true" name="notes edit" width="400" 375 max_length="8196" mouse_opaque="true" name="notes edit" width="400"
376 word_wrap="false" spell_check="true" /> 376 word_wrap="false" spell_check="true" />
377 </panel> 377 </panel>
378 </tab_container> 378 </tab_container>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index 95d0c33..fe60203 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
@@ -153,11 +153,15 @@
153 mouse_opaque="false" name="text_box7" v_pad="0" width="128"> 153 mouse_opaque="false" name="text_box7" v_pad="0" width="128">
154 Chat Bubbles: 154 Chat Bubbles:
155 </text> 155 </text>
156 <check_box bottom="-386" control_name="UseChatBubbles" enabled="true" follows="left|top" 156 <check_box bottom="-386" control_name="UseChatBubbles" enabled="true" follows="left|top"
157 font="SansSerifSmall" height="16" initial_value="false" 157 font="SansSerifSmall" height="16" initial_value="false"
158 label="Show chat bubbles" left="148" mouse_opaque="true" 158 label="Show chat bubbles" left="148" mouse_opaque="true"
159 name="bubble_text_chat" radio_style="false" width="237" /> 159 name="bubble_text_chat" radio_style="false" width="237" />
160 <slider bottom="-402" can_edit_text="false" control_name="ChatBubbleOpacity" 160 <check_box bottom="-386" control_name="UseLocalChatBubbles" enabled="true" follows="left|top"
161 font="SansSerifSmall" height="16" initial_value="false"
162 label="Show local chat and bubbles" left="288" mouse_opaque="true"
163 name="local_bubble_text_chat" radio_style="false" width="237" />
164 <slider bottom="-402" can_edit_text="false" control_name="ChatBubbleOpacity"
161 decimal_digits="3" enabled="true" follows="left|top" height="12" 165 decimal_digits="3" enabled="true" follows="left|top" height="12"
162 increment="0.05" initial_val="1" label="Bubble opacity:" left="148" max_val="1" 166 increment="0.05" initial_val="1" label="Bubble opacity:" left="148" max_val="1"
163 min_val="0" mouse_opaque="true" name="bubble_chat_opacity" show_text="true" 167 min_val="0" mouse_opaque="true" name="bubble_chat_opacity" show_text="true"
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 f85e3c0..b47794b 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
@@ -61,34 +61,34 @@
61 font="SansSerifSmall" height="16" initial_value="false" 61 font="SansSerifSmall" height="16" initial_value="false"
62 label="Hide my group title" left="151" name="show_my_title_checkbox" 62 label="Hide my group title" left="151" name="show_my_title_checkbox"
63 radio_style="false" width="256" /> 63 radio_style="false" width="256" />
64 <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-230" 64 <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-210"
65 can_apply_immediately="false" color="1 1 1 1" 65 can_apply_immediately="false" color="1 1 1 1"
66 enabled="true" follows="left|top" height="65" label="" left="153" 66 enabled="true" follows="left|top" height="65" label="" left="153"
67 mouse_opaque="true" name="effect_color_swatch" 67 mouse_opaque="true" name="effect_color_swatch"
68 tool_tip="Click to open Color Picker" width="55" /> 68 tool_tip="Click to open Color Picker" width="55" />
69 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 69 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
70 bottom="-235" drop_shadow_visible="true" enabled="true" follows="left|top" 70 bottom="-215" drop_shadow_visible="true" enabled="true" follows="left|top"
71 font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10" 71 font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
72 mouse_opaque="true" name="UI Size:" v_pad="0" width="128"> 72 mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
73 UI Size: 73 UI Size:
74 </text> 74 </text>
75 <slider bottom="-237" can_edit_text="true" 75 <slider bottom="-217" can_edit_text="true"
76 decimal_digits="3" enabled="true" height="16" increment="0.001" 76 decimal_digits="3" enabled="true" height="16" increment="0.001"
77 initial_val="1" left="148" max_val="1.4" min_val="0.75" mouse_opaque="true" 77 initial_val="1" left="148" max_val="1.4" min_val="0.75" mouse_opaque="true"
78 name="ui_scale_slider" show_text="true" value="1" width="220" /> 78 name="ui_scale_slider" show_text="true" value="1" width="220" />
79 <button bottom="-241" enabled="true" follows="left|top" 79 <button bottom="-221" enabled="true" follows="left|top"
80 font="SansSerif" halign="center" height="22" label="Reset" 80 font="SansSerif" halign="center" height="22" label="Reset"
81 label_selected="Reset" left_delta="226" mouse_opaque="true" 81 label_selected="Reset" left_delta="226" mouse_opaque="true"
82 name="reset_ui_size" scale_image="true" width="80" /> 82 name="reset_ui_size" scale_image="true" width="80" />
83 <check_box bottom="-256" enabled="true" follows="left|top" 83 <check_box bottom="-236" enabled="true" follows="left|top"
84 font="SansSerifSmall" height="16" initial_value="false" 84 font="SansSerifSmall" height="16" initial_value="false"
85 label="Use resolution independent scale" left="151" mouse_opaque="true" 85 label="Use resolution independent scale" left="151" mouse_opaque="true"
86 name="ui_auto_scale" radio_style="false" width="256" /> 86 name="ui_auto_scale" radio_style="false" width="256" />
87 <check_box bottom="-280" enabled="true" follows="left|top" 87 <check_box bottom="-260" enabled="true" follows="left|top"
88 font="SansSerifSmall" height="16" initial_value="false" 88 font="SansSerifSmall" height="16" initial_value="false"
89 label="Go Away/AFK when idle" left="330" mouse_opaque="true" 89 label="Go Away/AFK when idle" left="330" mouse_opaque="true"
90 name="afk_timeout_checkbox" radio_style="false" width="256" /> 90 name="afk_timeout_checkbox" radio_style="false" width="256" />
91 <spinner bottom="-280" decimal_digits="0" enabled="true" 91 <spinner bottom="-260" decimal_digits="0" enabled="true"
92 follows="left|top" height="16" increment="1" initial_val="300" 92 follows="left|top" height="16" increment="1" initial_val="300"
93 label="Away Timeout:" label_width="141" left="10" max_val="600" 93 label="Away Timeout:" label_width="141" left="10" max_val="600"
94 min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" /> 94 min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" />
@@ -109,18 +109,18 @@
109 mouse_opaque="true" name="mini_map_notify_sim" radio_style="false" 109 mouse_opaque="true" name="mini_map_notify_sim" radio_style="false"
110 width="256" /> 110 width="256" />
111 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 111 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
112 bottom="-332" drop_shadow_visible="true" enabled="true" follows="left|top" 112 bottom="-312" drop_shadow_visible="true" enabled="true" follows="left|top"
113 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10" 113 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
114 mouse_opaque="true" name="maturity_desired_label" v_pad="0" width="394"> 114 mouse_opaque="true" name="maturity_desired_label" v_pad="0" width="394">
115 Rating: 115 Rating:
116 </text> 116 </text>
117 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 117 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
118 bottom="-332" drop_shadow_visible="true" enabled="true" follows="left|top" 118 bottom="-312" drop_shadow_visible="true" enabled="true" follows="left|top"
119 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="151" 119 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="151"
120 mouse_opaque="true" name="maturity_desired_prompt" v_pad="0" width="394"> 120 mouse_opaque="true" name="maturity_desired_prompt" v_pad="0" width="394">
121 I want to access content rated: 121 I want to access content rated:
122 </text> 122 </text>
123 <combo_box bottom="-338" follows="left|top" height="18" left="320" 123 <combo_box bottom="-318" follows="left|top" height="18" left="315"
124 mouse_opaque="true" name="maturity_desired_combobox" width="150"> 124 mouse_opaque="true" name="maturity_desired_combobox" width="150">
125 <combo_item name="Desired_Adult" value="42"> 125 <combo_item name="Desired_Adult" value="42">
126 PG, Mature and Adult 126 PG, Mature and Adult
@@ -133,8 +133,8 @@
133 </combo_item> 133 </combo_item>
134 </combo_box> 134 </combo_box>
135 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 135 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
136 bottom="-332" drop_shadow_visible="true" enabled="true" follows="left|top" 136 bottom="-312" drop_shadow_visible="true" enabled="true" follows="left|top"
137 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="320" 137 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="315"
138 mouse_opaque="true" name="maturity_desired_textbox" v_pad="0" width="150"> 138 mouse_opaque="true" name="maturity_desired_textbox" v_pad="0" width="150">
139 PG only 139 PG only
140 </text> 140 </text>
@@ -151,25 +151,25 @@
151 Nametags: 151 Nametags:
152 </text> 152 </text>
153 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 153 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
154 bottom="-175" drop_shadow_visible="true" enabled="true" follows="left|top" 154 bottom="-155" drop_shadow_visible="true" enabled="true" follows="left|top"
155 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10" 155 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
156 mouse_opaque="true" name="effects_color_textbox" v_pad="0" width="394"> 156 mouse_opaque="true" name="effects_color_textbox" v_pad="0" width="394">
157 Selection Beam Color: 157 Selection Beam Color:
158 </text> 158 </text>
159 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 159 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
160 bottom="-274" drop_shadow_visible="true" enabled="true" follows="left|top" 160 bottom="-254" drop_shadow_visible="true" enabled="true" follows="left|top"
161 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="220" 161 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="220"
162 mouse_opaque="true" name="seconds_textbox" v_pad="0" width="128"> 162 mouse_opaque="true" name="seconds_textbox" v_pad="0" width="128">
163 seconds 163 seconds
164 </text> 164 </text>
165 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 165 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
166 bottom="-372" drop_shadow_visible="true" enabled="true" follows="left|top" 166 bottom="-352" drop_shadow_visible="true" enabled="true" follows="left|top"
167 font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10" 167 font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
168 mouse_opaque="true" name="time_textbox" v_pad="0" width="394"> 168 mouse_opaque="true" name="time_textbox" v_pad="0" width="394">
169 Clock: 169 Clock:
170 </text> 170 </text>
171 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 171 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
172 bottom="-404" drop_shadow_visible="true" enabled="true" follows="left|top" 172 bottom="-384" drop_shadow_visible="true" enabled="true" follows="left|top"
173 font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10" 173 font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
174 mouse_opaque="true" name="language_textbox" v_pad="0" width="394"> 174 mouse_opaque="true" name="language_textbox" v_pad="0" width="394">
175 Language: 175 Language:
@@ -181,10 +181,20 @@
181 v_pad="0" width="400"> 181 v_pad="0" width="400">
182 (requires restart for full effect) 182 (requires restart for full effect)
183 </text> 183 </text>
184 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
185 bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
186 font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
187 mouse_opaque="true" name="remember_password_text" v_pad="0" width="394">
188 Remember Password:
189 </text>
190 <check_box bottom_delta="0" follows="left|top"
191 font="SansSerifSmall" height="16" initial_value="false"
192 label="Remember Password" left="151" mouse_opaque="true"
193 name="remember_password" radio_style="false" width="256" />
184 <string name="region_name_prompt"> 194 <string name="region_name_prompt">
185 &lt;Type region name&gt; 195 &lt;Type region name&gt;
186 </string> 196 </string>
187 <combo_box allow_text_entry="false" bottom="-372" enabled="true" follows="left|top" 197 <combo_box allow_text_entry="false" bottom="-352" enabled="true" follows="left|top"
188 height="18" left="153" max_chars="20" mouse_opaque="true" 198 height="18" left="153" max_chars="20" mouse_opaque="true"
189 name="time_combobox" width="146"> 199 name="time_combobox" width="146">
190 <combo_item type="string" name="12HourTime" value="PST 12"> 200 <combo_item type="string" name="12HourTime" value="PST 12">
@@ -197,7 +207,7 @@
197 UTC 207 UTC
198 </combo_item> 208 </combo_item>
199 </combo_box> 209 </combo_box>
200 <combo_box allow_text_entry="true" bottom="-402" enabled="true" 210 <combo_box allow_text_entry="true" bottom="-382" enabled="true"
201 follows="left|top" height="16" left="153" max_chars="135" 211 follows="left|top" height="16" left="153" max_chars="135"
202 mouse_opaque="true" name="language_combobox" width="146"> 212 mouse_opaque="true" name="language_combobox" width="146">
203 <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default"> 213 <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
index 0611ce3..58a2989 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
@@ -5,8 +5,8 @@
5 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 5 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
6 bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top" 6 bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top"
7 font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10" 7 font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
8 mouse_opaque="true" name="muting_text" v_pad="0" width="400"> 8 mouse_opaque="true" name="muting_text" v_pad="0" width="500">
9 Select a skin (requires restart). 9 Select a skin (requires restart). (Please see the skin folders for information and credits)
10 </text> 10 </text>
11 <radio_group bottom="0" draw_border="false" follows="top|left" height="380" left="12" 11 <radio_group bottom="0" draw_border="false" follows="top|left" height="380" left="12"
12 name="skin_selection" width="480"> 12 name="skin_selection" width="480">
@@ -40,12 +40,24 @@
40 scale_image="true" label="" image_selected="skin_thumbnail_gemini.png" 40 scale_image="true" label="" image_selected="skin_thumbnail_gemini.png"
41 image_hover_selected="skin_thumbnail_gemini.png" image_unselected="skin_thumbnail_gemini.png" 41 image_hover_selected="skin_thumbnail_gemini.png" image_unselected="skin_thumbnail_gemini.png"
42 image_hover_unselected="skin_thumbnail_gemini.png" follows="left|top" /> 42 image_hover_unselected="skin_thumbnail_gemini.png" follows="left|top" />
43 43 <text name="skin_current_text"
44 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 44 left="10" bottom="5" halign="left" height="12"
45 bottom="10" drop_shadow_visible="true" enabled="true" follows="left|bottom" 45 follows="left|bottom" h_pad="0" v_pad="0"
46 font="SansSerifSmall" h_pad="0" halign="left" height="12" left="90" 46 bg_visible="false" drop_shadow_visible="true"
47 mouse_opaque="true" name="muting_text" v_pad="0" width="400"> 47 border_visible="false" border_drop_shadow_visible="false"
48 (Please see the skin folders for information and credits) 48 font="SansSerif" mouse_opaque="true">
49 Other Skin Name:
49 </text> 50 </text>
51 <line_editor name="skin_current_edit"
52 bottom_delta="0" left_delta="120" height="20" width="120"
53 follows="left|bottom" font="SansSerif"
54 bevel_style="in" border_style="line" border_thickness="1"
55 max_length="31" mouse_opaque="true"
56 handle_edit_keys_directly="true"
57 select_all_on_focus_received="true" />
58 <button name="save_skin" label="Save"
59 bottom_delta="-2" left_delta="120" height="24" width="90"
60 follows="left|center" font="SansSerif" halign="center"
61 mouse_opaque="true" scale_image="TRUE" />
50</panel> 62</panel>
51 63
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml
index 603f2d8..ce2d5ad 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml
@@ -41,15 +41,15 @@
41 </text> 41 </text>
42 42
43 <slider name="near_me_range" label="" control_name="NearMeRange" 43 <slider name="near_me_range" label="" control_name="NearMeRange"
44 bottom_delta="0" left_delta="62" width="110" height="15" 44 bottom_delta="0" left_delta="62" width="150" height="15"
45 follows="left|top" min_val="5" max_val="512" increment="1" 45 follows="left|top" min_val="5" max_val="2048" increment="1"
46 initial_val="96" decimal_digits="0" /> 46 initial_val="96" decimal_digits="0" />
47 47
48 <text name="meters" 48 <text name="meters"
49 bottom_delta="0" left="180" height="15" width="40" 49 bottom_delta="0" left_delta="10" height="15" width="40"
50 h_pad="0" halign="left" v_pad="0" follows="left|top" 50 h_pad="0" halign="left" v_pad="0" follows="left|top"
51 bg_visible="false" border_drop_shadow_visible="false" 51 bg_visible="false" border_drop_shadow_visible="false"
52 border_visible="false" drop_shadow_visible="true" 52 border_visible="false" drop_shadow_visible="true"
53 font="SansSerifSmall" mouse_opaque="true"> 53 font="SansSerifSmall" mouse_opaque="true">
54 m 54 m
55 </text> 55 </text>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml b/linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml
index 84ce9d0..5dd738a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml
@@ -25,7 +25,7 @@ regions in the estate.
25 (unknown) 25 (unknown)
26 </text> 26 </text>
27 <view_border bevel_style="in" border="true" border_thickness="1" bottom_delta="-295" 27 <view_border bevel_style="in" border="true" border_thickness="1" bottom_delta="-295"
28 follows="top|left" height="290" left="6" width="250" /> 28 follows="top|left" height="350" left="6" width="250" />
29 <check_box bottom_delta="265" follows="left|top" height="20" label="Use Global Time" 29 <check_box bottom_delta="265" follows="left|top" height="20" label="Use Global Time"
30 left="12" name="use_global_time_check" width="200" /> 30 left="12" name="use_global_time_check" width="200" />
31 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" 31 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
@@ -69,13 +69,12 @@ regions in the estate.
69 left="12" name="allow_direct_teleport" width="80" /> 69 left="12" name="allow_direct_teleport" width="80" />
70 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" 70 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
71 name="allow_direct_teleport_help" right="250" width="18" /> 71 name="allow_direct_teleport_help" right="250" width="18" />
72 <text bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="20" 72 <text bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="20"
73 left="10" name="abuse_email_text" width="180"> 73 left="10" name="abuse_email_text" width="180">
74 Abuse email address: 74 Abuse email address:
75 </text> 75 </text>
76 <line_editor bottom_delta="-16" follows="top|left" height="19" left="15" max_length="254" 76 <line_editor bottom_delta="-16" follows="top|left" height="19" left="15" max_length="254"
77 name="abuse_email_address" width="205" /> 77 name="abuse_email_address" width="205" />
78 <string name="email_unsupported">Feature unsupported</string>
79 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" 78 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
80 name="abuse_email_address_help" right="250" width="18" /> 79 name="abuse_email_address_help" right="250" width="18" />
81 <button bottom_delta="-26" enabled="false" follows="left|top" height="20" label="Apply" 80 <button bottom_delta="-26" enabled="false" follows="left|top" height="20" label="Apply"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_region_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_region_general.xml
index 6302428..70df1df 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_region_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_region_general.xml
@@ -58,16 +58,21 @@
58 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" 58 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
59 left="205" name="parcel_search_help" width="18" /> 59 left="205" name="parcel_search_help" width="18" />
60 <spinner bottom_delta="-40" follows="left|top" height="20" increment="1" 60 <spinner bottom_delta="-40" follows="left|top" height="20" increment="1"
61 label="Agent Limit" label_width="97" left="10" max_val="100" min_val="1" 61 label="Agent Limit" label_width="100" left="10" max_val="100" min_val="1"
62 name="agent_limit_spin" width="170" /> 62 name="agent_limit_spin" width="170" />
63 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" 63 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
64 left="205" name="agent_limit_help" width="18" /> 64 left="205" name="agent_limit_help" width="18" />
65 <spinner bottom_delta="-20" follows="left|top" height="20" increment="0.5" 65 <spinner bottom_delta="-20" follows="left|top" height="20" increment="0.5"
66 label="Object Bonus" label_width="97" left="10" max_val="10" min_val="1" 66 label="Object Bonus" label_width="100" left="10" max_val="10" min_val="1"
67 name="object_bonus_spin" width="170" /> 67 name="object_bonus_spin" width="170" />
68 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" 68 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
69 left="205" name="object_bonus_help" width="18" /> 69 left="205" name="object_bonus_help" width="18" />
70 <text bottom_delta="-30" follows="left|top" height="20" label="Maturity" left="10" 70 <spinner bottom_delta="-20" follows="left|top" height="20" increment="0.5"
71 label="Minimum Agent Age" label_width="100" left="10" max_val="1000" min_val="0"
72 name="minimum_agent_age" width="170" />
73 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
74 left="205" name="minimum_agent_age_help" width="18" />
75 <text bottom_delta="-30" follows="left|top" height="20" label="Maturity" left="10"
71 name="access_text" width="100"> 76 name="access_text" width="100">
72 Rating: 77 Rating:
73 </text> 78 </text>
@@ -87,7 +92,7 @@
87 left="205" name="access_help" width="18" /> 92 left="205" name="access_help" width="18" />
88 <button bottom_delta="-30" enabled="false" follows="left|top" height="20" label="Apply" 93 <button bottom_delta="-30" enabled="false" follows="left|top" height="20" label="Apply"
89 left="108" name="apply_btn" width="100" /> 94 left="108" name="apply_btn" width="100" />
90 <button bottom_delta="-60" follows="left|top" height="20" 95 <button bottom_delta="-40" follows="left|top" height="20"
91 label="Teleport Home One User..." left="10" name="kick_btn" width="250" /> 96 label="Teleport Home One User..." left="10" name="kick_btn" width="250" />
92 <button bottom_delta="-23" follows="left|top" height="20" 97 <button bottom_delta="-23" follows="left|top" height="20"
93 label="Teleport Home All Users..." left="10" name="kick_all_btn" width="250" /> 98 label="Teleport Home All Users..." left="10" name="kick_all_btn" width="250" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_region_open_region_settings.xml b/linden/indra/newview/skins/default/xui/en-us/panel_region_open_region_settings.xml
new file mode 100644
index 0000000..3eb7806
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_region_open_region_settings.xml
@@ -0,0 +1,76 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<panel border="true" bottom="100" follows="top|left" height="320" label="Region Settings"
3 left="0" name="RegionSettings" width="480">
4 <spinner bottom_delta="-40" follows="left|top" height="20" increment="1"
5 label="Default Draw Distance" label_width="175" left="10" max_val="10000" min_val="1"
6 name="draw_distance" width="250" />
7 <check_box bottom_delta="-20" follows="left|top" height="20" label="Force Draw Distance"
8 left="10" name="force_draw_distance" width="80" />
9 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
10 left="285" name="force_draw_distance_help" width="18" />
11 <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
12 label="Max Drag Distance" label_width="175" left="10" max_val="1000 0" min_val="0"
13 name="max_drag_distance" width="250" />
14 <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
15 label="Max Prim Scale" label_width="175" left="10" max_val="10000" min_val="0"
16 name="max_prim_scale" width="250" />
17 <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
18 label="Min Prim Scale" label_width="175" left="10" max_val="10000" min_val="0"
19 name="min_prim_scale" width="250" />
20 <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
21 label="Max Physical Prim Scale" label_width="175" left="10" max_val="10000" min_val="0"
22 name="max_phys_prim_scale" width="250" />
23 <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
24 label="Max Hollow Size" label_width="175" left="10" max_val="100" min_val="0"
25 name="max_hollow_size" width="250" />
26 <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
27 label="Min Hole Size" label_width="175" left="10" max_val="100" min_val="0"
28 name="min_hole_size" width="250" />
29 <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
30 label="Max Link Count" label_width="175" left="10" max_val="100000" min_val="0"
31 name="max_link_count" width="250" />
32 <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
33 label="Max Link Count Phys" label_width="175" left="10" max_val="100000" min_val="0"
34 name="max_link_count_phys" width="250" />
35 <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
36 label="Max Inventory Items To Transfer" label_width="175" left="10" max_val="10000" min_val="-1"
37 name="max_inventory_items_transfer" width="250" />
38 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
39 left="285" name="max_inventory_items_transfer_help" width="18" />
40 <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
41 label="Show Tags" label_width="175" left="10" max_val="2" min_val="0"
42 name="show_tags" width="250" />
43 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
44 left="285" name="show_tags_help" width="18" />
45 <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
46 label="Max Groups" label_width="175" left="10" max_val="1000" min_val="-1"
47 name="max_groups" width="250" />
48 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
49 left="285" name="max_groups_help" width="18" />
50 <check_box bottom_delta="-20" follows="left|top" height="20" label="Render Water" left="10"
51 name="render_water" width="80" />
52 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
53 left="285" name="render_water_help" width="18" />
54 <check_box bottom_delta="-20" follows="left|top" height="20" label="Allow Minimap"
55 left="10" name="allow_minimap" width="80" />
56 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
57 left="285" name="allow_minimap_help" width="18" />
58 <check_box bottom_delta="-20" follows="left|top" height="20" label="Allow Physical Prims"
59 left="10" name="allow_physical_prims" width="80" />
60 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
61 left="285" name="allow_physical_prims_help" width="18" />
62 <check_box bottom_delta="-20" follows="left|top" height="20" label="Enable Teen Mode"
63 left="10" name="enable_teen_mode" width="80" />
64 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
65 left="285" name="enable_teen_mode_help" width="18" />
66 <check_box bottom_delta="-20" follows="left|top" height="20" label="Enforce Max Build Constraints"
67 left="10" name="enforce_max_build" width="80" />
68 <check_box bottom_delta="-20" follows="left|top" height="20"
69 label="Allow Parcel WindLight" left="10"
70 name="allow_parcel_windlight"
71 width="80" />
72 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
73 left="285" name="allow_parcel_windlight_help" width="18" />
74 <button bottom_delta="-30" enabled="false" follows="left|top" height="20" label="Apply"
75 left="108" name="apply_ors_btn" width="100" />
76</panel>
generated by cgit v1.1 at 2024-11-15 16:25:07 +0000