aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/skins')
-rw-r--r--linden/indra/newview/skins/default/colors_base.xml6
-rw-r--r--linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.pngbin0 -> 10714 bytes
-rw-r--r--linden/indra/newview/skins/default/html/en-us/loading/loading.html2
-rw-r--r--linden/indra/newview/skins/default/textures/arrow_left.tgabin0 -> 510 bytes
-rw-r--r--linden/indra/newview/skins/default/textures/arrow_right.tgabin0 -> 510 bytes
-rw-r--r--linden/indra/newview/skins/default/textures/textures.xml3
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_animation_list.xml74
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_asset_browser.xml29
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml8
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml18
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml98
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_object_im_info.xml54
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_prim_import.xml5
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_profile.xml4
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_rlv_behaviour.xml11
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_tools.xml216
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml24
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml42
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml20
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml206
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/notify.xml5
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml568
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml10
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml62
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml17
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml6
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml16
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml8
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml4
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml82
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml4
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_windlight_controls.xml14
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml22
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml34
-rw-r--r--linden/indra/newview/skins/silver/colors_base.xml3
-rw-r--r--linden/indra/newview/skins/silver/textures/arrow_left.tgabin0 -> 424 bytes
-rw-r--r--linden/indra/newview/skins/silver/textures/arrow_right.tgabin0 -> 424 bytes
-rw-r--r--linden/indra/newview/skins/silver/xui/en-us/panel_avatar.xml430
40 files changed, 1152 insertions, 957 deletions
diff --git a/linden/indra/newview/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml
index 1f97a2e..9ad1787 100644
--- a/linden/indra/newview/skins/default/colors_base.xml
+++ b/linden/indra/newview/skins/default/colors_base.xml
@@ -69,7 +69,9 @@
69<TextEmbeddedItemColor value="0, 0, 128, 255" /> <!-- Text of items embedded in notecards --> 69<TextEmbeddedItemColor value="0, 0, 128, 255" /> <!-- Text of items embedded in notecards -->
70<TextDefaultColor value="0, 20, 0, 255"/> <!-- Non-keyword text in the script editor --> 70<TextDefaultColor value="0, 20, 0, 255"/> <!-- Non-keyword text in the script editor -->
71<ScriptBgReadOnlyColor value="100, 100, 100, 255" /> <!-- Not used --> 71<ScriptBgReadOnlyColor value="100, 100, 100, 255" /> <!-- Not used -->
72 72<TextLinkColor value="144, 165, 208, 255"/>
73<TextLinkHoverColor value="255, 255, 255, 255"/>
74
73<!-- LISTBOXES --> 75<!-- LISTBOXES -->
74<ScrollBgReadOnlyColor value="200, 209, 204, 255" /> <!-- Background of read only lists --> 76<ScrollBgReadOnlyColor value="200, 209, 204, 255" /> <!-- Background of read only lists -->
75<ScrollBgWriteableColor value="200, 209, 204, 255" /> <!-- Background of editable lists, e.g. groups--> 77<ScrollBgWriteableColor value="200, 209, 204, 255" /> <!-- Background of editable lists, e.g. groups-->
@@ -159,6 +161,8 @@
159<!-- MAP --> 161<!-- MAP -->
160<MapAvatar value="0, 255, 0, 255" /> <!-- Your avatar's glyph color --> 162<MapAvatar value="0, 255, 0, 255" /> <!-- Your avatar's glyph color -->
161<MapFriend value="255, 255, 0, 255" /> <!-- Your friends' glyph color --> 163<MapFriend value="255, 255, 0, 255" /> <!-- Your friends' glyph color -->
164<MapMuted value="128, 128, 128, 255" /> <!-- Muted avatars' glyph color -->
165<MapSelected value="255, 0, 0, 255" /> <!-- Selected avatars' glyph color -->
162 166
163 <!-- MINI-MAP --> 167 <!-- MINI-MAP -->
164<NetMapBackgroundColor value="0, 0, 0, 77" /> <!-- Mini-map floater background --> 168<NetMapBackgroundColor value="0, 0, 0, 77" /> <!-- Mini-map floater background -->
diff --git a/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png b/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png
new file mode 100644
index 0000000..f9ea7a2
--- /dev/null
+++ b/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png
Binary files differ
diff --git a/linden/indra/newview/skins/default/html/en-us/loading/loading.html b/linden/indra/newview/skins/default/html/en-us/loading/loading.html
index 1c62d2f..97174b0 100644
--- a/linden/indra/newview/skins/default/html/en-us/loading/loading.html
+++ b/linden/indra/newview/skins/default/html/en-us/loading/loading.html
@@ -2,7 +2,7 @@
2<table width="100%" height="100%" border="0"> 2<table width="100%" height="100%" border="0">
3 <tr> 3 <tr>
4 <td align="center" valign="middle" style="font-size:0.8em;"> 4 <td align="center" valign="middle" style="font-size:0.8em;">
5 <img src="sl_logo_rotate_black.gif" align="absmiddle"><br/>&nbsp;&nbsp;&nbsp;loading... 5 <img src="imprudence_loading.png" align="absmiddle"><br/>&nbsp;&nbsp;&nbsp;loading...
6 </td> 6 </td>
7 </tr> 7 </tr>
8</table> 8</table>
diff --git a/linden/indra/newview/skins/default/textures/arrow_left.tga b/linden/indra/newview/skins/default/textures/arrow_left.tga
new file mode 100644
index 0000000..68e6280
--- /dev/null
+++ b/linden/indra/newview/skins/default/textures/arrow_left.tga
Binary files differ
diff --git a/linden/indra/newview/skins/default/textures/arrow_right.tga b/linden/indra/newview/skins/default/textures/arrow_right.tga
new file mode 100644
index 0000000..7a5a30e
--- /dev/null
+++ b/linden/indra/newview/skins/default/textures/arrow_right.tga
Binary files differ
diff --git a/linden/indra/newview/skins/default/textures/textures.xml b/linden/indra/newview/skins/default/textures/textures.xml
index 89399ef..9b0e4c7 100644
--- a/linden/indra/newview/skins/default/textures/textures.xml
+++ b/linden/indra/newview/skins/default/textures/textures.xml
@@ -364,6 +364,9 @@
364 <texture name="icn_label_music.tga"/> 364 <texture name="icn_label_music.tga"/>
365 <texture name="icn_label_media.tga"/> 365 <texture name="icn_label_media.tga"/>
366 <texture name="arrow_down.tga"/> 366 <texture name="arrow_down.tga"/>
367 <texture name="arrow_up.tga"/>
368 <texture name="arrow_left.tga"/>
369 <texture name="arrow_right.tga"/>
367 <texture name="cloud-particle.j2c" use_mips="true"/> 370 <texture name="cloud-particle.j2c" use_mips="true"/>
368 371
369 <texture name="skin_thumbnail_default.png" preload="true" /> 372 <texture name="skin_thumbnail_default.png" preload="true" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_animation_list.xml b/linden/indra/newview/skins/default/xui/en-us/floater_animation_list.xml
new file mode 100644
index 0000000..be7de86
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_animation_list.xml
@@ -0,0 +1,74 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2<floater
3 name="animation list"
4 title="Animation List"
5 can_resize="true"
6 can_minimize="true"
7 can_close="true"
8 can_drag_on_left="false"
9 rect_control="FloaterAnimationListRect"
10 min_width="1000"
11 min_height="275"
12 >
13 <scroll_list
14 name="animation_list"
15 left="10"
16 right="-10"
17 top="-20"
18 bottom="100"
19 column_padding="0"
20 can_resize="true"
21 follows="left|top|bottom|right"
22 draw_heading="true"
23 multi_select="true"
24 search_column="1"
25 tool_tip="Hold shift or control while clicking to select multiple thingers"
26 >
27 <!-- Icons relating to the avatar, currently: tracking, and marked -->
28 <column name="Anim Name" label="Anim Name" width="250"/>
29 <column name="Animation UUID" label="Animation UUID" width="250"/>
30 <!--<column name="object_name" label="Distance" dynamicwidth="true"/>-->
31 <column name="Source Object UUID" label="Source Object UUID" width="250"/>
32 <column name="Source Owner" label="Source Owner" width="250"/>
33 <!-- What the avatar is doing: producing sounds, rezzing, particles, etc -->
34 </scroll_list>
35 <panel
36 name="options"
37 left="10"
38 right="-10"
39 top="90"
40 bottom="10"
41 border="true"
42 mouse_opaque="true"
43 bevel_style="in"
44 background_visible="true"
45 background_opaque="true"
46 follows="left|right|bottom"
47 bg_opaque_color="0,0,0,0.3"
48 bg_alpha_color="blue"
49 can_resize="false"
50 >
51 </panel>
52
53 <button bottom="55" follows="left|bottom" font="SansSerifSmall" halign="center"
54 height="20" label="Stop Selected" left_delta="5"
55 mouse_opaque="true" name="Stop Selected"
56 tool_tip="Stop selected animations" width="150" />
57 <button bottom_delta="0" follows="left|bottom" font="SansSerifSmall" halign="center"
58 height="20" label="Revoke Selected" left_delta="155"
59 mouse_opaque="true" name="Revoke Selected"
60 tool_tip="Revokes animation permissions for object associated with the selections" width="150" />
61 <button bottom_delta="0" follows="left|bottom" font="SansSerifSmall" halign="center"
62 height="20" label="Stop+Revoke Selected" left_delta="155"
63 mouse_opaque="true" name="Stop+Revoke Selected"
64 tool_tip="Revokes animation permissions for object(s) associated with the selections, as well as stopping the anim" width="150" />
65 <button bottom_delta="0" follows="left|bottom" font="SansSerifSmall" halign="center"
66 height="20" label="Open Owner Profile" left_delta="155"
67 mouse_opaque="true" name="Open Owner Profile"
68 tool_tip="Opens profile of the owner(s) of object(s) associated with the selections" width="150" />
69 <button bottom_delta="-25" enabled="false" follows="left|bottom" font="SansSerifSmall" halign="center"
70 height="20" label="Return Object" left_delta="-465"
71 mouse_opaque="true" name="Return Object"
72 tool_tip="Returns object(s) selected, if you have land powers" width="150" />
73
74</floater> \ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_asset_browser.xml b/linden/indra/newview/skins/default/xui/en-us/floater_asset_browser.xml
new file mode 100644
index 0000000..13c6b6c
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_asset_browser.xml
@@ -0,0 +1,29 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2
3<floater bottom="-300" can_close="true" can_drag_on_left="false" can_minimize="true"
4 can_resize="true" enabled="true" follows="left|bottom" height="620"
5 hidden="false" left="300" min_height="420" min_width="630"
6 mouse_opaque="true" name="asset browser" title="Asset Browser" width="720">
7
8 <inventory_panel allow_multi_select="false" border="true" bottom="-299" enabled="true"
9 follows="left|top" height="280" hidden="false" left="10"
10 mouse_opaque="true" name="inventory panel"
11 sort_order="TexturePickerSortOrder" width="231"/>
12
13 <button bottom="-350" follows="left|top" font="SansSerifSmall"
14 halign="center" height="20" hidden="false" label="Next &gt;&gt;"
15 left="160" mouse_opaque="true" name="button next" scale_image="TRUE"
16 width="80"/>
17
18 <button bottom_delta="-30" follows="left|top" font="SansSerifSmall"
19 halign="center" height="20" hidden="false" label="&lt;&lt; Previous"
20 left_delta="0" mouse_opaque="true" name="button previous" scale_image="TRUE"
21 width="80"/>
22
23 <button bottom_delta="-30" follows="left|top" font="SansSerifSmall"
24 halign="center" height="20" hidden="false" label="Refresh"
25 left_delta="0" mouse_opaque="true" name="button refresh" scale_image="TRUE"
26 width="80"/>
27
28</floater>
29
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
index d32832c..dd66a83 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
@@ -1,5 +1,5 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater bottom="27" can_close="true" can_drag_on_left="false" can_minimize="false" 2<floater bottom="27" can_close="true" can_drag_on_left="false" can_minimize="true"
3 can_resize="true" can_tear_off="true" enabled="true" height="270" left="15" 3 can_resize="true" can_tear_off="true" enabled="true" height="270" left="15"
4 min_height="150" min_width="425" mouse_opaque="true" name="chat floater" 4 min_height="150" min_width="425" mouse_opaque="true" name="chat floater"
5 rect_control="FloaterChatRect" title="Local Chat" width="435"> 5 rect_control="FloaterChatRect" title="Local Chat" width="435">
@@ -59,10 +59,14 @@
59 <panel bottom="5" follows="left|right|bottom" left="5" name="chat_panel" right="-5" 59 <panel bottom="5" follows="left|right|bottom" left="5" name="chat_panel" right="-5"
60 tab_group="1" top="25"> 60 tab_group="1" top="25">
61 <string name="gesture_label">Gestures</string> 61 <string name="gesture_label">Gestures</string>
62 <spinner bottom="-22" decimal_digits="0" follows="left|bottom" height="20"
63 increment="1.00" initial_val="0" label="Channel" label_width="50" left="0"
64 max_val="2147483647" min_val="0" mouse_opaque="true" name="channel_control"
65 width="100" tool_tip="Set the default channel for inworld chat"/>
62 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="0" 66 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="0"
63 enabled="true" follows="left|right|bottom" font="SansSerif" 67 enabled="true" follows="left|right|bottom" font="SansSerif"
64 handle_edit_keys_directly="false" height="20" label="Click here to chat." 68 handle_edit_keys_directly="false" height="20" label="Click here to chat."
65 left="0" max_length="254" mouse_opaque="true" name="Chat Editor" 69 left="105" max_length="254" mouse_opaque="true" name="Chat Editor"
66 right="-70" select_all_on_focus_received="false" select_on_focus="false" 70 right="-70" select_all_on_focus_received="false" select_on_focus="false"
67 tab_group="1" /> 71 tab_group="1" />
68 <flyout_button bottom="0" follows="right|bottom" height="20" label="Say" left="-65" 72 <flyout_button bottom="0" follows="right|bottom" height="20" label="Say" left="-65"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
index 3d1c569..f0c97f2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
@@ -205,5 +205,23 @@
205 <on_click filter="" function="Inventory.SetSortBy" userdata="systemfolderstotop" /> 205 <on_click filter="" function="Inventory.SetSortBy" userdata="systemfolderstotop" />
206 </menu_item_check> 206 </menu_item_check>
207 </menu> 207 </menu>
208 <menu bottom_delta="64" drop_shadow="true" height="49"
209 label="Search" left="0" mouse_opaque="false" name="Sort" opaque="true"
210 tear_off="true" width="118">
211 <menu_item_check bottom_delta="-18" control_name="Inventory.SearchByName" height="18"
212 label="By Name" left="0" mouse_opaque="true" name="By Name" width="118">
213 <on_click filter="" function="Inventory.SetSearchBy" userdata="name" />
214 </menu_item_check>
215 <menu_item_check bottom_delta="-18" control_name="Inventory.SearchByCreator" height="18"
216 label="By Creator" left="0" mouse_opaque="true" name="By Creator" width="118">
217 <on_click filter="" function="Inventory.SetSearchBy" userdata="creator" />
218 </menu_item_check>
219 <menu_item_separator bottom_delta="-8" height="8" left="0" mouse_opaque="true" name="separator"
220 width="118" />
221 <menu_item_check bottom_delta="-18" control_name="Inventory.SearchByAll" height="18"
222 label="By All" left="0" mouse_opaque="true" name="By All" width="118">
223 <on_click filter="" function="Inventory.SetSearchBy" userdata="all" />
224 </menu_item_check>
225 </menu>
208 </menu_bar> 226 </menu_bar>
209</floater> 227</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
index 318f46a..7beb7e4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
@@ -1,7 +1,7 @@
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="440" min_height="140" min_width="467" name="floater_about" 3 height="440" min_height="140" min_width="467" name="floater_about"
4 rect_control="FloaterMediaRect" title="Media Browser" width="560"> 4 rect_control="FloaterMediaRect" title="Web Browser" width="560">
5 <layout_stack name="stack1" bottom="0" follows="left|right|top|bottom" left="10" top="-20" width="540"> 5 <layout_stack name="stack1" bottom="0" follows="left|right|top|bottom" left="10" top="-20" width="540">
6 <layout_panel auto_resize="false" bottom="0" height="20" left="0" name="nav_controls" user_resize="false" 6 <layout_panel auto_resize="false" bottom="0" height="20" left="0" name="nav_controls" user_resize="false"
7 width="540"> 7 width="540">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
new file mode 100644
index 0000000..3485812
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
@@ -0,0 +1,98 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater can_close="true" can_drag_on_left="false" can_minimize="false" can_resize="true"
3 can_tear_off="false" follows="top|right" height="455" min_height="400" min_width="240"
4 name="minimap" rect_control="FloaterMiniMapRect" width="200">
5
6 <panel label="Mini Map" name="mini_mapview"
7 top="-2" left="2" bottom="196" right="196"
8 follows="left|top|right|bottom" mouse_opaque="false" />
9
10 <panel name="RadarPanel" label="Radar"
11 background_visible="true" bg_alpha_color="NetMapBackgroundColor"
12 left="2" top="196" right="196" height="120"
13 follows="left|right|bottom" border="false" mouse_opaque="true">
14
15 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
16 bottom="-20" drop_shadow_visible="true" follows="left|top"
17 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
18 mouse_opaque="true" name="lblAvatarCount" v_pad="0"
19 width="220">
20 0
21 </text>
22 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
23 bottom="-20" drop_shadow_visible="true" follows="left|top"
24 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="27"
25 mouse_opaque="true" name="avatars_in" v_pad="0"
26 width="220">
27 Avatars in
28 </text>
29 <slider bottom_delta="0" left_delta="55" follows="left|top" width="110" height="15"
30 name="near_me_range" label="" control_name="NearMeRange"
31 min_val="5" max_val="512" increment="1" initial_val="96" decimal_digits="0" />
32 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
33 bottom_delta="0" left="190" drop_shadow_visible="true" follows="left|top"
34 font="SansSerifSmall" h_pad="0" halign="left" height="15"
35 mouse_opaque="true" name="meters" v_pad="0"
36 width="40">
37 Meters
38 </text>
39 <tab_container border="false" bottom_delta="-176" height="172" left="0" mouse_opaque="false"
40 name="button_container" tab_position="top" follows="left|right|bottom" width="198">
41 <panel border="true" bottom="-180" follows="left|top|right|bottom" height="160"
42 label="Avatars" left="1" mouse_opaque="true" name="avatar_tab" width="198">
43 <button bottom="-25" follows="top|right" height="22" label="IM/Call"
44 left="-85" name="im_btn" tool_tip="Open Instant Message session"
45 width="80" />
46 <button bottom_delta="-25" follows="top|right" height="22" label="Profile"
47 left_delta="0" name="profile_btn"
48 tool_tip="Show picture, groups, and other information" width="80" />
49 <button bottom_delta="-25" follows="top|right" height="22" label="Teleport..."
50 left_delta="0" name="offer_teleport_btn"
51 tool_tip="Offer this friend a teleport to your current location" width="80" />
52 <button bottom_delta="-25" follows="top|right" height="22" label="Track"
53 left_delta="0" name="track_btn"
54 tool_tip="Create a beacon to track this avatar" width="80" />
55 <button bottom_delta="-25" follows="top|right" height="22" label="Invite..."
56 left_delta="0" name="invite_btn"
57 tool_tip="Remove this person from your friends list" width="80" />
58 <button bottom_delta="-25" follows="top|right" height="22" label="Add..."
59 left_delta="0" name="add_btn" tool_tip="Offer friendship to a resident"
60 width="80" />
61 </panel>
62 <panel border="true" bottom="-160" follows="left|top|right|bottom" height="160"
63 label="Estate" left="1" mouse_opaque="true" name="estate_tab" width="198">
64 <button bottom="-25" follows="top|right" height="22" label="Freeze..."
65 left="-85" name="freeze_btn" tool_tip=""
66 width="80" />
67 <button bottom_delta="-25" follows="top|right" height="22" label="Eject..."
68 left_delta="0" name="eject_btn"
69 tool_tip="" width="80" />
70 <button bottom_delta="-25" follows="top|right" height="22" label="Mute..."
71 left_delta="0" name="mute_btn"
72 tool_tip="" width="80" />
73 <button bottom_delta="-25" follows="top|right" height="22" label="Unmute..."
74 left_delta="0" name="unmute_btn"
75 tool_tip="" width="80" />
76 <button bottom_delta="-25" follows="top|right" height="22" label="Report..."
77 left_delta="0" name="ar_btn"
78 tool_tip="" width="80" />
79 <button bottom_delta="-25" follows="top|right" height="22" label="Kick..."
80 left_delta="0" name="estate_eject_btn" tool_tip=""
81 width="80" />
82 </panel>
83 </tab_container>
84 <scroll_list bottom="-190" width="104" height="143" left="4"
85 follows="left|bottom|right" draw_border="false" draw_heading="true"
86 draw_stripes="true" column_padding="5" sort_column="1" mouse_opaque="true"
87 background_visible="true" multi_select="false" name="RadarList">
88 <column name="avatar_name" label="Name" dynamicwidth="true" />
89 <column name="avatar_distance" label="Dist." width="48" />
90 </scroll_list>
91 </panel>
92 <string name="no_one_near">
93 No avatars within range
94 </string>
95 <string name="muted">
96 (muted)
97 </string>
98</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_object_im_info.xml b/linden/indra/newview/skins/default/xui/en-us/floater_object_im_info.xml
new file mode 100644
index 0000000..615b7d1
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_object_im_info.xml
@@ -0,0 +1,54 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater bottom="0" can_close="true" can_drag_on_left="false" can_minimize="true"
3 can_resize="false" can_tear_off="true" enabled="true" height="140" left="0"
4 mouse_opaque="true" name="object im info" width="300"
5 rect_control="FloaterObjectIMInfo" short_title="Object Info" title="Object Information" >
6
7 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
8 bottom="-35" drop_shadow_visible="true" follows="left|top"
9 font="SansSerif" h_pad="0" halign="left" height="10" left="10"
10 mouse_opaque="true" name="LabelItemNameTitle" v_pad="0" width="78">
11 Object:
12 </text>
13 <text bevel_style="none" border_style="line" border_visible="false"
14 border_thickness="0" bottom_delta="-10" enabled="true" follows="left|top"
15 font="SansSerif" height="20" is_unicode="false" left="70"
16 max_length="254" mouse_opaque="false" name="ObjectName"
17 width="200" />
18
19 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
20 bottom="-60" drop_shadow_visible="true" follows="left|top"
21 font="SansSerif" h_pad="0" halign="left" height="10" left="10"
22 mouse_opaque="true" name="LabelSlurlTitle" v_pad="0" width="78">
23 Location:
24 </text>
25 <text bevel_style="none" border_style="line" border_visible="false"
26 border_thickness="0" bottom_delta="-10" enabled="true" follows="left|top"
27 font="SansSerif" height="20" is_unicode="false" left="70" hover="true"
28 max_length="254" mouse_opaque="true" name="Slurl" font-style="UNDERLINE"
29 width="200" hover_cursor="UI_CURSOR_HAND" text_color="TextLinkColor" hover_color="TextLinkHoverColor"/>
30
31 <!-- A new viewer talking to an old sim will not have a slurl available and will show this. -->
32 <text bevel_style="none" border_style="line" border_visible="false"
33 border_thickness="0" bottom_delta="0" enabled="true" follows="left|top"
34 font="SansSerif" height="20" is_unicode="false" left_delta="0" hover="false"
35 max_length="254" mouse_opaque="false" name="Unknown_Slurl" width="200">
36 (Location Info Not Available)
37 </text>
38
39 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
40 bottom="-85" drop_shadow_visible="true" follows="left|top"
41 font="SansSerif" h_pad="0" halign="left" height="10" left="10"
42 mouse_opaque="true" name="LabelOwnerNameTitle" v_pad="0" width="78">
43 Owner:
44 </text>
45 <text bevel_style="none" border_style="line" border_visible="false"
46 border_thickness="0" bottom_delta="-10" enabled="true" follows="left|top"
47 font="SansSerif" height="20" is_unicode="false" left="70" hover="true"
48 max_length="254" mouse_opaque="true" name="OwnerName" font-style="UNDERLINE"
49 width="200" hover_cursor="UI_CURSOR_HAND" text_color="TextLinkColor" hover_color="TextLinkHoverColor"/>
50
51 <button bottom_delta="-30" font="SansSerif" halign="center" height="20" label="Mute Owner"
52 label_selected="Mute Owner" left="70" mouse_opaque="true" name="Mute"
53 width="160" />
54</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_prim_import.xml b/linden/indra/newview/skins/default/xui/en-us/floater_prim_import.xml
new file mode 100644
index 0000000..191b31e
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_prim_import.xml
@@ -0,0 +1,5 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater can_close="true" can_drag_on_left="true" can_minimize="false"
3 can_resize="false" height="80" name="Import" title="Import progress" width="200" mouse_opaque="true">
4 <text height="15" left="10" name="name_label" top="-10"> Progress </text>
5</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_profile.xml b/linden/indra/newview/skins/default/xui/en-us/floater_profile.xml
index daf45cf..c67443f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_profile.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_profile.xml
@@ -1,6 +1,6 @@
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" 2<floater can_close="true" can_drag_on_left="false" can_minimize="true"
3 can_resize="false" height="520" min_height="0" min_width="0" 3 can_resize="false" height="545" min_height="0" min_width="0"
4 name="avatarinfo" title="Profile" width="420"> 4 name="avatarinfo" title="Profile" width="420">
5 <panel bottom="-520" height="486" left="0" name="Panel Avatar" width="430" /> 5 <panel bottom="-545" height="511" left="0" name="Panel Avatar" width="430" />
6</floater> 6</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_rlv_behaviour.xml b/linden/indra/newview/skins/default/xui/en-us/floater_rlv_behaviour.xml
new file mode 100644
index 0000000..d9e70e6
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_rlv_behaviour.xml
@@ -0,0 +1,11 @@
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"
3 height="425" min_height="200" min_width="375" name="rlvBehaviours"
4 title="Active RLV Restrictions" width="350">
5 <scroll_list bottom="-400" draw_border="true" draw_heading="true"
6 follows="top|left|bottom|right" height="365" left="15" multi_select="false"
7 name="behaviour_list" right="-15">
8 <column label="Restriction" name="behaviour" width="170" />
9 <column label="Object Name" name="name" width="170" />
10 </scroll_list>
11</floater> \ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
index a9ac7fa..9333153 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
@@ -1,5 +1,5 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater bottom="-300" can_close="true" can_drag_on_left="false" can_minimize="false" 2<floater bottom="-300" can_close="true" can_drag_on_left="false" can_minimize="true"
3 can_resize="false" follows="left|top" height="526" name="Snapshot" 3 can_resize="false" follows="left|top" height="526" name="Snapshot"
4 rect_control="FloaterSnapshotRect" title="Snapshot Preview" width="215"> 4 rect_control="FloaterSnapshotRect" title="Snapshot Preview" width="215">
5 <text bottom_delta="-40" follows="top|left" height="15" left="10" name="type_label" 5 <text bottom_delta="-40" follows="top|left" height="15" left="10" name="type_label"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index eb9b1c6..a57c568 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -1,6 +1,6 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater bottom="-359" can_close="true" can_drag_on_left="false" can_minimize="true" 2<floater bottom="-374" can_close="true" can_drag_on_left="false" can_minimize="true"
3 can_resize="false" follows="left|top" height="550" 3 can_resize="false" follows="left|top" height="565"
4 left="308" min_height="100" min_width="100" mouse_opaque="true" 4 left="308" min_height="100" min_width="100" mouse_opaque="true"
5 name="toolbox floater" rect_control="ToolboxRect" sound_flags="0" title="" 5 name="toolbox floater" rect_control="ToolboxRect" sound_flags="0" title=""
6 short_title="Build" width="272"> 6 short_title="Build" width="272">
@@ -83,38 +83,45 @@
83 font="SansSerifSmall" height="16" initial_value="false" 83 font="SansSerifSmall" height="16" initial_value="false"
84 label="Edit linked parts" left="4" mouse_opaque="true" 84 label="Edit linked parts" left="4" mouse_opaque="true"
85 name="checkbox edit linked parts" width="114" /> 85 name="checkbox edit linked parts" width="114" />
86 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 86 <button bottom_delta="-19" follows="left|top" font="SansSerifSmall"
87 bottom_delta="-20" drop_shadow_visible="true" follows="left|top" 87 halign="center" height="18" label="Link" label_selected="Link"
88 left="10" mouse_opaque="true" name="link_btn" width="68" />
89 <button bottom_delta="0" follows="left|top" font="SansSerifSmall"
90 halign="center" height="18" label="Unlink" label_selected="Unlink"
91 left_delta="75" mouse_opaque="true" name="unlink_btn" width="68" />
92 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
93 bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
88 font="SansSerifSmall" h_pad="0" halign="left" height="14" left="6" 94 font="SansSerifSmall" h_pad="0" halign="left" height="14" left="6"
89 mouse_opaque="true" name="text ruler mode" v_pad="0" width="68"> 95 mouse_opaque="true" name="text ruler mode" v_pad="0" width="68">
90 Ruler mode: 96 Ruler:
91 </text> 97 </text>
92 <combo_box allow_text_entry="false" bottom_delta="-4" follows="left|top" height="20" 98 <combo_box allow_text_entry="false" bottom_delta="-4" follows="left|top" height="20"
93 left_delta="74" max_chars="20" mouse_opaque="true" 99 left_delta="40" max_chars="20" mouse_opaque="true"
94 name="combobox grid mode" width="86"> 100 name="combobox grid mode" width="86">
95 <combo_item name="World" value="World"> 101 <combo_item name="World" value="World">
96 World 102 World
97 </combo_item> 103 </combo_item>
98 <combo_item name="Local" value="Local"> 104 <combo_item name="Local" value="Local">
99 Local 105 Local
100 </combo_item> 106 </combo_item>
101 <combo_item name="Reference" value="Reference"> 107 <combo_item name="Reference" value="Reference">
102 Reference 108 Reference
103 </combo_item> 109 </combo_item>
104 </combo_box> 110 </combo_box>
105 <check_box bottom="-70" control_name="ScaleUniform" follows="left|top" 111 <check_box bottom="-70" control_name="ScaleUniform" follows="left|top"
106 font="SansSerifSmall" height="16" initial_value="false" 112 font="SansSerifSmall" height="16" initial_value="false"
107 label="Stretch Both Sides" left="143" mouse_opaque="true" 113 label="Stretch Both Sides" left="143" mouse_opaque="true"
108 name="checkbox uniform" width="134" /> 114 name="checkbox uniform" width="134" />
109 <check_box bottom_delta="-15" control_name="ScaleStretchTextures" follows="left|top" 115 <check_box bottom_delta="-15" control_name="ScaleStretchTextures" follows="left|top"
110 font="SansSerifSmall" height="16" initial_value="true" 116 font="SansSerifSmall" height="16" initial_value="true"
111 label="Stretch Textures" left_delta="0" mouse_opaque="true" 117 label="Stretch Textures" left_delta="0" mouse_opaque="true"
112 name="checkbox stretch textures" width="134" /> 118 name="checkbox stretch textures" width="134" />
113 <check_box bottom_delta="-19" control_name="SnapEnabled" follows="left|top" 119 <check_box bottom_delta="-19" control_name="SnapEnabled" follows="left|top"
114 font="SansSerifSmall" height="16" initial_value="true" label="Use Grid" 120 font="SansSerifSmall" height="16" initial_value="true" label="Use Grid"
115 left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" /> 121 left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" />
116 <button bottom_delta="-14" follows="left|top" font="SansSerifSmall" halign="center" 122 <button bottom_delta="-19" follows="left|top" font="SansSerifSmall"
117 height="16" label="Options..." label_selected="Options..." left_delta="20" 123 halign="center" valign="center"
124 height="20" label="Options..." label_selected="Options..." left_delta="20"
118 mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" /> 125 mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />
119 126
120<!-- Help text --> 127<!-- Help text -->
@@ -227,6 +234,13 @@
227 image_unselected="object_grass.tga" label="" label_selected="" 234 image_unselected="object_grass.tga" label="" label_selected=""
228 left_delta="23" mouse_opaque="true" name="ToolGrass" scale_image="TRUE" 235 left_delta="23" mouse_opaque="true" name="ToolGrass" scale_image="TRUE"
229 tool_tip="Grass" width="24" /> 236 tool_tip="Grass" width="24" />
237 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
238 bottom="-104" drop_shadow_visible="true" follows="left|top"
239 font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-5"
240 mouse_opaque="true" name="tree_grass_label" v_pad="0" width="135" />
241 <combo_box max_chars="20" enabled="false" allow_text_entry="false" name="trees_grass"
242 height="18" width="135" right="-5" bottom="-122"
243 follows="left|top" mouse_opaque="true" />
230 <check_box bottom="-117" control_name="CreateToolKeepSelected" follows="left|top" 244 <check_box bottom="-117" control_name="CreateToolKeepSelected" follows="left|top"
231 font="SansSerifSmall" height="16" initial_value="false" 245 font="SansSerifSmall" height="16" initial_value="false"
232 label="Keep Tool Selected" left="4" mouse_opaque="true" 246 label="Keep Tool Selected" left="4" mouse_opaque="true"
@@ -276,18 +290,18 @@
276 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" 290 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false"
277 border_visible="false" bottom_delta="-16" drop_shadow_visible="true" enabled="true" 291 border_visible="false" bottom_delta="-16" drop_shadow_visible="true" enabled="true"
278 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" left="118" 292 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" left="118"
279 hidden="false" mouse_opaque="true" name="Brush:" v_pad="0" width="100"> 293 hidden="false" mouse_opaque="true" name="Bulldozer:" v_pad="0" width="100">
280 Brush: 294 Bulldozer:
281 </text> 295 </text>
282 296
283 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" 297 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false"
284 border_visible="false" bottom_delta="-18" drop_shadow_visible="true" enabled="true" 298 border_visible="false" bottom_delta="-18" drop_shadow_visible="true" enabled="true"
285 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" left="132" 299 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" left="132"
286 hidden="false" mouse_opaque="true" name="Brush Size:" v_pad="0" width="100"> 300 hidden="false" mouse_opaque="true" name="Dozer Size:" v_pad="0" width="100">
287 Size 301 Size
288 </text> 302 </text>
289 <volume_slider bottom_delta="-4" follows="left|top" height="16" hidden="false" 303 <volume_slider bottom_delta="-4" follows="left|top" height="16" hidden="false"
290 increment="1.0" initial_val="0.0" left="178" max_val="2.0" min_val="0.0" 304 increment="0.1" initial_val="2.0" left="178" max_val="11.0" min_val="1.0"
291 mouse_opaque="true" name="slider brush size" width="80" /> 305 mouse_opaque="true" name="slider brush size" width="80" />
292 306
293 307
@@ -299,21 +313,23 @@
299 </text> 313 </text>
300 <volume_slider bottom_delta="-4" follows="left|top" height="16" hidden="false" 314 <volume_slider bottom_delta="-4" follows="left|top" height="16" hidden="false"
301 increment="0.1" initial_val="0.00" left="178" max_val="2.0" min_val="-1.0" 315 increment="0.1" initial_val="0.00" left="178" max_val="2.0" min_val="-1.0"
302 mouse_opaque="true" name="slider force" width="80" /> 316 mouse_opaque="true" name="slider force" width="80" />
303 317 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
304 318 bottom="-168" left="118" drop_shadow_visible="true" follows="left|top"
305 <button bottom="-163" follows="left|top" font="SansSerifSmall" halign="center" 319 font="SansSerifSmall" h_pad="0" halign="right" height="16"
306 height="20" label="More &gt;&gt;" left="186" mouse_opaque="true" 320 mouse_opaque="true" name="obj_count" v_pad="0" width="143">
307 name="button more" scale_image="TRUE" tool_tip="Advanced Options" 321 Selected objects: [COUNT]
308 width="80" /> 322 </text>
309 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center" 323 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
310 height="20" label="&lt;&lt; Less" left_delta="0" mouse_opaque="true" 324 bottom="-181" left="118" drop_shadow_visible="true" follows="left|top"
311 name="button less" scale_image="TRUE" tool_tip="Advanced Options" 325 font="SansSerifSmall" h_pad="0" halign="right" height="16"
312 width="80" /> 326 mouse_opaque="true" name="prim_count" v_pad="0" width="143">
327 primitives: [COUNT]
328 </text>
313 329
314<!-- Sub-tabs --> 330<!-- Sub-tabs -->
315 331
316 <tab_container bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="false" 332 <tab_container bottom="-565" follows="left|top" height="384" left="0" mouse_opaque="false"
317 name="Object Info Tabs" tab_max_width="52" tab_min_width="40" 333 name="Object Info Tabs" tab_max_width="52" tab_min_width="40"
318 tab_position="top" width="272"> 334 tab_position="top" width="272">
319 <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367" 335 <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
@@ -351,7 +367,7 @@
351 Thrax Linden 367 Thrax Linden
352 </text> 368 </text>
353 <button bottom="-66" follows="top|right" font="SansSerifSmall" halign="center" 369 <button bottom="-66" follows="top|right" font="SansSerifSmall" halign="center"
354 height="16" label="Profile..." label_selected="Profile..." left_delta="94" 370 height="20" label="Profile..." label_selected="Profile..." left_delta="94"
355 mouse_opaque="true" name="button creator profile" scale_image="TRUE" 371 mouse_opaque="true" name="button creator profile" scale_image="TRUE"
356 width="78" /> 372 width="78" />
357 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 373 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -367,32 +383,42 @@
367 Thrax Linden 383 Thrax Linden
368 </text> 384 </text>
369 <button bottom="-86" follows="top|right" font="SansSerifSmall" halign="center" 385 <button bottom="-86" follows="top|right" font="SansSerifSmall" halign="center"
370 height="16" label="Profile..." label_selected="Profile..." left_delta="94" 386 height="20" label="Profile..." label_selected="Profile..." left_delta="94"
371 mouse_opaque="true" name="button owner profile" scale_image="TRUE" 387 mouse_opaque="true" name="button owner profile" scale_image="TRUE"
372 width="78" /> 388 width="78" />
389 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
390 bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
391 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
392 mouse_opaque="true" name="LastOwner:" v_pad="0" width="78">
393 Last Owner:
394 </text>
395 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
396 bottom_delta="0" drop_shadow_visible="true" follows="left|top"
397 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
398 mouse_opaque="true" name="Last Owner Name" v_pad="0" width="88">
399 Thrax Linden
400 </text>
401 <button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
402 height="20" label="Profile..." label_selected="Profile..." left_delta="94"
403 mouse_opaque="true" name="button last owner profile" scale_image="TRUE"
404 width="78" />
373 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 405 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
374 bottom="-106" drop_shadow_visible="true" follows="left|top" 406 bottom="-126" drop_shadow_visible="true" follows="left|top"
375 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10" 407 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
376 mouse_opaque="true" name="Group:" v_pad="0" width="78"> 408 mouse_opaque="true" name="Group:" v_pad="0" width="78">
377 Group: 409 Group:
378 </text> 410 </text>
379 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 411 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
380 bottom="-106" drop_shadow_visible="true" follows="left|top" 412 bottom="-126" drop_shadow_visible="true" follows="left|top"
381 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78" 413 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
382 mouse_opaque="true" name="Group Name Proxy" v_pad="0" visible="false" 414 mouse_opaque="true" name="Group Name Proxy" v_pad="0" visible="false"
383 width="88"> 415 width="88">
384 The Lindens 416 The Lindens
385 </text> 417 </text>
386 <button bottom="-106" follows="top|right" font="SansSerifSmall" halign="center" 418 <button bottom="-126" follows="top|right" font="SansSerifSmall" halign="center"
387 height="16" label="Set..." label_selected="Set..." left_delta="94" 419 height="20" label="Set..." label_selected="Set..." left_delta="94"
388 mouse_opaque="true" name="button set group" scale_image="TRUE" width="78" /> 420 mouse_opaque="true" name="button set group" scale_image="TRUE" width="78" />
389 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 421 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
390 bottom="-126" drop_shadow_visible="true" follows="left|top"
391 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
392 mouse_opaque="true" name="prim info" v_pad="0" width="166">
393 1 Object, 1 Primitive
394 </text>
395 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
396 bottom_delta="-20" drop_shadow_visible="true" follows="left|top" 422 bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
397 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10" 423 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
398 mouse_opaque="true" name="Permissions:" v_pad="0" width="85"> 424 mouse_opaque="true" name="Permissions:" v_pad="0" width="85">
@@ -407,7 +433,7 @@
407 <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" 433 <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
408 initial_value="false" label="Share with group" left="10" 434 initial_value="false" label="Share with group" left="10"
409 mouse_opaque="true" name="checkbox share with group" 435 mouse_opaque="true" name="checkbox share with group"
410 tool_tip="Allow group members to move, modify, copy and delete." 436 tool_tip="Allow all members of the set group to share and use your permissions for this object. You must Deed to enable role restrictions."
411 width="166" /> 437 width="166" />
412 <string name="text deed continued"> 438 <string name="text deed continued">
413 Deed... 439 Deed...
@@ -415,8 +441,8 @@
415 <string name="text deed"> 441 <string name="text deed">
416 Deed 442 Deed
417 </string> 443 </string>
418 <button bottom="-186" follows="top|right" font="SansSerifSmall" halign="center" 444 <button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
419 height="16" label="Deed..." label_selected="Deed..." left_delta="172" 445 height="20" label="Deed..." label_selected="Deed..." left_delta="172"
420 mouse_opaque="true" name="button deed" scale_image="TRUE" 446 mouse_opaque="true" name="button deed" scale_image="TRUE"
421 tool_tip="Group shared objects can be deeded by a group officer." 447 tool_tip="Group shared objects can be deeded by a group officer."
422 width="78" /> 448 width="78" />
@@ -504,37 +530,37 @@
504 </combo_item> 530 </combo_item>
505 </combo_box> 531 </combo_box>
506 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 532 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
507 bottom="-135" drop_shadow_visible="true" follows="left|top" 533 bottom="-115" drop_shadow_visible="true" follows="left|top"
508 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88" 534 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"
509 mouse_opaque="true" name="B:" v_pad="0" width="174"> 535 mouse_opaque="true" name="B:" v_pad="0" width="174">
510 B: 536 B:
511 </text> 537 </text>
512 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 538 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
513 bottom="-135" drop_shadow_visible="true" follows="left|top" 539 bottom="-115" drop_shadow_visible="true" follows="left|top"
514 font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50" 540 font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
515 mouse_opaque="true" name="O:" v_pad="0" width="124"> 541 mouse_opaque="true" name="O:" v_pad="0" width="124">
516 O; 542 O;
517 </text> 543 </text>
518 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 544 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
519 bottom="-135" drop_shadow_visible="true" follows="left|top" 545 bottom="-115" drop_shadow_visible="true" follows="left|top"
520 font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50" 546 font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
521 mouse_opaque="true" name="G:" v_pad="0" width="74"> 547 mouse_opaque="true" name="G:" v_pad="0" width="74">
522 G: 548 G:
523 </text> 549 </text>
524 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 550 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
525 bottom="-147" drop_shadow_visible="true" follows="left|top" 551 bottom="-127" drop_shadow_visible="true" follows="left|top"
526 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88" 552 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"
527 mouse_opaque="true" name="E:" v_pad="0" width="174"> 553 mouse_opaque="true" name="E:" v_pad="0" width="174">
528 E: 554 E:
529 </text> 555 </text>
530 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 556 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
531 bottom="-147" drop_shadow_visible="true" follows="left|top" 557 bottom="-127" drop_shadow_visible="true" follows="left|top"
532 font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50" 558 font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
533 mouse_opaque="true" name="N:" v_pad="0" width="124"> 559 mouse_opaque="true" name="N:" v_pad="0" width="124">
534 N: 560 N:
535 </text> 561 </text>
536 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 562 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
537 bottom="-147" drop_shadow_visible="true" follows="left|top" 563 bottom="-127" drop_shadow_visible="true" follows="left|top"
538 font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50" 564 font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
539 mouse_opaque="true" name="F:" v_pad="0" width="74"> 565 mouse_opaque="true" name="F:" v_pad="0" width="74">
540 F: 566 F:
@@ -634,15 +660,15 @@
634 </text> 660 </text>
635 <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16" 661 <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
636 increment="0.01" initial_val="0" label="X" label_width="10" left="10" 662 increment="0.01" initial_val="0" label="X" label_width="10" left="10"
637 max_val="10" min_val="0.01" mouse_opaque="true" name="Scale X" 663 min_val="0.01" mouse_opaque="true" name="Scale X"
638 text_enabled_color="1, 1, 1, 1" width="96" /> 664 text_enabled_color="1, 1, 1, 1" width="96" />
639 <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16" 665 <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
640 increment="0.01" initial_val="0" label="Y" label_width="10" left="10" 666 increment="0.01" initial_val="0" label="Y" label_width="10" left="10"
641 max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Y" 667 min_val="0.01" mouse_opaque="true" name="Scale Y"
642 text_enabled_color="1, 1, 1, 1" width="96" /> 668 text_enabled_color="1, 1, 1, 1" width="96" />
643 <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16" 669 <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
644 increment="0.01" initial_val="0" label="Z" label_width="10" left="10" 670 increment="0.01" initial_val="0" label="Z" label_width="10" left="10"
645 max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Z" 671 min_val="0.01" mouse_opaque="true" name="Scale Z"
646 text_enabled_color="1, 1, 1, 1" width="96" /> 672 text_enabled_color="1, 1, 1, 1" width="96" />
647 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 673 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
648 bottom_delta="-16" drop_shadow_visible="true" follows="left|top" 674 bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
@@ -751,12 +777,12 @@
751 Skew 777 Skew
752 </text> 778 </text>
753 <spinner bottom_delta="-20" decimal_digits="1" follows="left|top" height="16" 779 <spinner bottom_delta="-20" decimal_digits="1" follows="left|top" height="16"
754 increment="5" initial_val="0" left="121" max_val="95" min_val="0" 780 increment="5" initial_val="0" left="121" max_val="95" min_val="0"
755 mouse_opaque="true" name="Scale 1" width="68" label=" " label_width="10"/> 781 mouse_opaque="true" name="Scale 1" width="68" />
756 <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16" 782 <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
757 increment="0.05" initial_val="0" left_delta="73" max_val="0.95" label_width="10" 783 increment="0.05" initial_val="0" left_delta="73" max_val="0.95"
758 min_val="-0.95" mouse_opaque="true" name="Skew" width="68" label=" " /> 784 min_val="-0.95" mouse_opaque="true" name="Skew" width="68" />
759 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 785 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
760 bottom_delta="-15" drop_shadow_visible="true" follows="left|top" 786 bottom_delta="-15" drop_shadow_visible="true" follows="left|top"
761 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121" 787 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
762 mouse_opaque="true" name="Hollow Shape" v_pad="0" width="141"> 788 mouse_opaque="true" name="Hollow Shape" v_pad="0" width="141">
@@ -875,10 +901,10 @@
875 </text> 901 </text>
876 <spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16" 902 <spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16"
877 increment="0.05" initial_val="0" left="121" max_val="1" min_val="-1" 903 increment="0.05" initial_val="0" left="121" max_val="1" min_val="-1"
878 mouse_opaque="true" name="Radius Offset" width="68" label=" " label_width="10" /> 904 mouse_opaque="true" name="Radius Offset" width="68" />
879 <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16" 905 <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
880 increment="0.1" initial_val="1" left_delta="73" max_val="4" min_val="1" 906 increment="0.1" initial_val="1" left_delta="73" max_val="4" min_val="1"
881 mouse_opaque="true" name="Revolutions" width="68" label=" " label_width="10" /> 907 mouse_opaque="true" name="Revolutions" width="68" />
882 <texture_picker allow_no_texture="false" bottom="-211" can_apply_immediately="true" 908 <texture_picker allow_no_texture="false" bottom="-211" can_apply_immediately="true"
883 default_image_name="Default" follows="left|top" height="141" 909 default_image_name="Default" follows="left|top" height="141"
884 label="Sculpt Texture" left="121" mouse_opaque="true" 910 label="Sculpt Texture" left="121" mouse_opaque="true"
@@ -1179,7 +1205,7 @@
1179 initial_val="1" left="112" max_val="10" min_val="0.1" mouse_opaque="true" 1205 initial_val="1" left="112" max_val="10" min_val="0.1" mouse_opaque="true"
1180 name="rptctrl" width="68" /> 1206 name="rptctrl" width="68" />
1181 <button bottom="-256" follows="left|top" font="SansSerifSmall" halign="center" 1207 <button bottom="-256" follows="left|top" font="SansSerifSmall" halign="center"
1182 height="16" label="Apply" label_selected="Apply" left_delta="78" 1208 height="20" label="Apply" label_selected="Apply" left_delta="78"
1183 mouse_opaque="true" name="button apply" scale_image="TRUE" width="75" /> 1209 mouse_opaque="true" name="button apply" scale_image="TRUE" width="75" />
1184 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 1210 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
1185 bottom="-288" drop_shadow_visible="true" follows="left|top" 1211 bottom="-288" drop_shadow_visible="true" follows="left|top"
@@ -1210,10 +1236,13 @@
1210 </panel> 1236 </panel>
1211 <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367" 1237 <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
1212 label="Content" left="1" mouse_opaque="false" name="Contents" width="270"> 1238 label="Content" left="1" mouse_opaque="false" name="Contents" width="270">
1213 <button bottom="-30" follows="left|top" font="SansSerif" halign="center" height="20" 1239 <button bottom="-30" follows="left|top" font="SansSerif" halign="center" height="20"
1214 label="New Script..." label_selected="New Script..." 1240 label="New Script" label_selected="New Script..."
1215 left="10" mouse_opaque="true" name="button new script" scale_image="TRUE" 1241 left="10" mouse_opaque="true" name="button new script" scale_image="TRUE"
1216 width="130" /> 1242 width="100" />
1243 <!--<button bottom_delta="0" left_delta="110" width="100" height="20" follows="left|top"
1244 label="Permissions..." name="button permissions" font="SansSerif" halign="center"
1245 mouse_opaque="true" scale_image="TRUE" />-->
1217 <panel bottom_delta="-330" follows="left|top" height="325" left="10" 1246 <panel bottom_delta="-330" follows="left|top" height="325" left="10"
1218 mouse_opaque="true" name="ContentsInventory" width="252" /> 1247 mouse_opaque="true" name="ContentsInventory" width="252" />
1219 </panel> 1248 </panel>
@@ -1223,22 +1252,10 @@
1223 1252
1224 <panel bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="true" 1253 <panel bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="true"
1225 name="land info panel" width="272"> 1254 name="land info panel" width="272">
1255 <!-- Parcel Information -->
1226 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 1256 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
1227 bottom="-40" drop_shadow_visible="true" follows="left|top" 1257 bottom="-40" drop_shadow_visible="true" follows="left|top"
1228 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40" 1258 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
1229 mouse_opaque="true" name="label_parcel_modify" v_pad="0" width="150">
1230 Modify Parcel
1231 </text>
1232 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
1233 height="20" label="Subdivide..." label_selected="Subdivide..." left="48"
1234 mouse_opaque="true" name="button subdivide land" scale_image="TRUE"
1235 width="112" />
1236 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
1237 height="20" label="Join..." label_selected="Join..." left="48"
1238 mouse_opaque="true" name="button join land" scale_image="TRUE" width="112" />
1239 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
1240 bottom_delta="-56" drop_shadow_visible="true" follows="left|top"
1241 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
1242 mouse_opaque="true" name="label_parcel_info" v_pad="0" width="150"> 1259 mouse_opaque="true" name="label_parcel_info" v_pad="0" width="150">
1243 Parcel Information 1260 Parcel Information
1244 </text> 1261 </text>
@@ -1258,12 +1275,27 @@
1258 height="20" label="About Land..." label_selected="About Land..." left="48" 1275 height="20" label="About Land..." label_selected="About Land..." left="48"
1259 mouse_opaque="true" name="button about land" scale_image="TRUE" width="112" /> 1276 mouse_opaque="true" name="button about land" scale_image="TRUE" width="112" />
1260 <check_box bottom_delta="-24" control_name="ShowParcelOwners" follows="left|top" 1277 <check_box bottom_delta="-24" control_name="ShowParcelOwners" follows="left|top"
1261 tool_tip="Colour parcels according to their status" font="SansSerifSmall" 1278 tool_tip="Colour parcels according to their ownership" font="SansSerifSmall"
1262 height="16" initial_value="false" label="Show Status" left="48" 1279 height="16" initial_value="false" label="Show owners" left="48"
1263 mouse_opaque="true" name="checkbox show owners" width="100" /> 1280 mouse_opaque="true" name="checkbox show owners" width="100" />
1264 <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" 1281 <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
1265 height="18" label="?" label_selected="?" left_delta="94" 1282 height="18" label="?" label_selected="?" left_delta="94"
1266 mouse_opaque="true" name="button show owners help" width="18" /> 1283 mouse_opaque="true" name="button show owners help" width="18" />
1284 <!-- Modify Parcel -->
1285 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
1286 bottom_delta="-56" drop_shadow_visible="true" follows="left|top"
1287 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
1288 mouse_opaque="true" name="label_parcel_modify" v_pad="0" width="150">
1289 Modify Parcel
1290 </text>
1291 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
1292 height="20" label="Subdivide..." label_selected="Subdivide..." left="48"
1293 mouse_opaque="true" name="button subdivide land" scale_image="TRUE"
1294 width="112" />
1295 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
1296 height="20" label="Join..." label_selected="Join..." left="48"
1297 mouse_opaque="true" name="button join land" scale_image="TRUE" width="112" />
1298 <!-- Land Transactions -->
1267 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 1299 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
1268 bottom_delta="-56" drop_shadow_visible="true" follows="left|top" 1300 bottom_delta="-56" drop_shadow_visible="true" follows="left|top"
1269 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40" 1301 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
@@ -1294,10 +1326,10 @@
1294 Click and drag to change view 1326 Click and drag to change view
1295 </string> 1327 </string>
1296 <string name="status_grab"> 1328 <string name="status_grab">
1297 Drag to move objects, Ctrl to lift, Ctrl-Shift to spin 1329 Drag to move, Ctrl to lift, Ctrl-Shift to rotate
1298 </string> 1330 </string>
1299 <string name="status_place"> 1331 <string name="status_place">
1300 Click in the world to create, shift-click to select 1332 Click inworld to build
1301 </string> 1333 </string>
1302 <string name="status_selectland"> 1334 <string name="status_selectland">
1303 Click and drag to select land 1335 Click and drag to select land
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 906e7de..471b3e5 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
@@ -4,29 +4,35 @@
4 min_width="400" mouse_opaque="true" name="WindLight floater" 4 min_width="400" mouse_opaque="true" name="WindLight floater"
5 rect_control="FloaterAdvancedSkyRect" title="Advanced Sky Editor" 5 rect_control="FloaterAdvancedSkyRect" title="Advanced Sky 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 Sky Presets: 12 Sky Presets:
13 </text> 13 </text>
14 <combo_box allow_text_entry="false" bottom="-50" follows="left|top" height="18" 14 <combo_box allow_text_entry="false" bottom="-52" follows="left|top" height="18"
15 left_delta="110" max_chars="20" mouse_opaque="true" name="WLPresetsCombo" 15 left_delta="110" max_chars="20" mouse_opaque="true" name="WLPresetsCombo"
16 width="150" /> 16 width="150" />
17 <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
18 label="" label_selected="" left_delta="-25" image_overlay="arrow_left.tga"
19 mouse_opaque="true" name="prev" scale_image="true" width="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"
22 mouse_opaque="true" name="next" scale_image="true" width="20" />
17 <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20" 23 <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
18 label="New" label_selected="New" left_delta="170" 24 label="New" label_selected="New" left_delta="40"
19 mouse_opaque="true" name="WLNewPreset" scale_image="true" width="70" /> 25 mouse_opaque="true" name="WLNewPreset" scale_image="true" width="70" />
20 <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20" 26 <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
21 label="Save" label_selected="Save" left_delta="80" 27 label="Save" label_selected="Save" left_delta="70"
22 mouse_opaque="true" name="WLSavePreset" scale_image="true" width="70" /> 28 mouse_opaque="true" name="WLSavePreset" scale_image="true" width="70" />
23 <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20" 29 <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
24 label="Delete" label_selected="Delete" left_delta="80" 30 label="Delete" label_selected="Delete" left_delta="70"
25 mouse_opaque="true" name="WLDeletePreset" scale_image="true" width="70" /> 31 mouse_opaque="true" name="WLDeletePreset" scale_image="true" width="70" />
26 <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20" 32 <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
27 label="Day Cycle Editor" label_selected="Day Cycle Editor" 33 label="Day Cycle Editor" label_selected="Day Cycle Editor"
28 left_delta="120" mouse_opaque="true" name="WLDayCycleMenuButton" 34 left_delta="100" mouse_opaque="true" name="WLDayCycleMenuButton"
29 scale_image="true" width="120" /> 35 scale_image="true" width="125" />
30 <tab_container bottom="-220" follows="left|top" height="160" left="0" 36 <tab_container bottom="-220" follows="left|top" height="160" left="0"
31 mouse_opaque="false" name="WindLight Tabs" tab_position="top" width="700"> 37 mouse_opaque="false" name="WindLight Tabs" tab_position="top" width="700">
32 <panel border="true" bottom="-220" follows="left|top|right|bottom" height="160" 38 <panel border="true" bottom="-220" follows="left|top|right|bottom" height="160"
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
new file mode 100644
index 0000000..0172b41
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
@@ -0,0 +1,42 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<menu bottom="100" color="MenuDefaultBgColor" drop_shadow="true" height="101" left="100"
3 mouse_opaque="false" name="popup" opaque="true" width="128">
4 <menu_item_call bottom_delta="-18" height="18" label="Zoom Close" left="0"
5 mouse_opaque="true" name="Zoom Close" width="128">
6 <on_click function="MiniMap.ZoomLevel" userdata="2" />
7 </menu_item_call>
8 <menu_item_call bottom_delta="-18" height="18" label="Zoom Medium" left="0"
9 mouse_opaque="true" name="Zoom Medium" width="128">
10 <on_click function="MiniMap.ZoomLevel" userdata="1" />
11 </menu_item_call>
12 <menu_item_call bottom_delta="-18" height="18" label="Zoom Far" left="0"
13 mouse_opaque="true" name="Zoom Far" width="128">
14 <on_click function="MiniMap.ZoomLevel" userdata="0" />
15 </menu_item_call>
16 <menu_item_separator />
17 <menu_item_check bottom_delta="-18" enabled="true" height="18" label="Center on Camera"
18 left="0" mouse_opaque="true" name="Center on Camera" width="128">
19 <on_click function="MiniMap.Center" userdata="1" />
20 <on_check function="MiniMap.CheckCenter" userdata="1" />
21 </menu_item_check>
22 <menu_item_check bottom_delta="-18" enabled="true" height="18" label="Rotate Mini-Map"
23 left="0" mouse_opaque="true" name="Rotate Mini-Map" width="128">
24 <on_click function="MiniMap.Rotate" userdata="" />
25 <on_check function="MiniMap.CheckRotate" userdata="" />
26 </menu_item_check>
27 <menu_item_separator />
28 <menu_item_call bottom_delta="-18" enabled = "false" height="18" label="Show Map"
29 left="0" mouse_opaque="true" name="Show Map" width="128">
30 <on_click function="MiniMap.ShowWorldMap" userdata="" />
31 </menu_item_call>
32 <menu_item_call bottom_delta="-18" enabled = "false" height="18" label="Stop Tracking"
33 left="0" mouse_opaque="true" name="Stop Tracking" width="128">
34 <on_click function="MiniMap.StopTracking" />
35 <on_enable function="MiniMap.EnableTracking" />
36 </menu_item_call>
37 <menu_item_call bottom_delta="-18" enabled = "false" height="18" label="Profile..."
38 left="0" mouse_opaque="true" name="Profile" width="128">
39 <on_click function="MiniMap.ShowProfile" />
40 <on_enable function="MiniMap.EnableProfile" />
41 </menu_item_call>
42</menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
index 7ef84c4..15cdc9e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
@@ -44,7 +44,11 @@
44 <on_enable function="Object.EnableReturn" /> 44 <on_enable function="Object.EnableReturn" />
45 </menu_item_call> 45 </menu_item_call>
46 <pie_menu label="More &gt;" name="Rate Menu"> 46 <pie_menu label="More &gt;" name="Rate Menu">
47 <menu_item_separator /> 47 <menu_item_call label="Backup" enabled="false" hidden="false"
48 mouse_opaqu="true" name="Export">
49 <on_click function="Object.Export" />
50 <on_enable function="Object.EnableExport" />
51 </menu_item_call>
48 <menu_item_call enabled="false" label="Mute" mouse_opaque="true" name="Object Mute"> 52 <menu_item_call enabled="false" label="Mute" mouse_opaque="true" name="Object Mute">
49 <on_click function="Object.Mute" /> 53 <on_click function="Object.Mute" />
50 <on_enable function="Object.EnableMute" /> 54 <on_enable function="Object.EnableMute" />
@@ -54,14 +58,22 @@
54 <on_click function="Object.ReportAbuse" /> 58 <on_click function="Object.ReportAbuse" />
55 <on_enable function="Object.EnableReportAbuse" /> 59 <on_enable function="Object.EnableReportAbuse" />
56 </menu_item_call> 60 </menu_item_call>
57 <menu_item_separator /> 61 <menu_item_call enabled="false" label="Go Here" mouse_opaque="true" name="Go Here">
62 <on_click function="GoToObject" />
63 </menu_item_call>
58 <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect"> 64 <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
59 <on_click function="Object.Inspect" /> 65 <on_click function="Object.Inspect" />
60 <on_enable function="Object.EnableInspect" /> 66 <on_enable function="Object.EnableInspect" />
61 </menu_item_call> 67 </menu_item_call>
68 <menu_item_call name="Link" enabled="false" label="Link">
69 <on_click function="Tools.Link" userdata="" />
70 <on_enable function="Tools.EnableLink" />
71 </menu_item_call>
62 <menu_item_separator /> 72 <menu_item_separator />
63 <menu_item_separator /> 73 <menu_item_call name="Unlink" enabled="false" label="Unlink">
64 <menu_item_separator /> 74 <on_click function="Tools.Unlink" userdata="" />
75 <on_enable function="Tools.EnableUnlink" />
76 </menu_item_call>
65 </pie_menu> 77 </pie_menu>
66 <menu_item_call enabled="false" label="Buy..." mouse_opaque="true" name="Buy..."> 78 <menu_item_call enabled="false" label="Buy..." mouse_opaque="true" name="Buy...">
67 <on_click function="Object.Buy" /> 79 <on_click function="Object.Buy" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 72b828d..81c49e7 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -8,6 +8,14 @@
8 8
9 <menu name="File" create_jump_keys="true" label="File" 9 <menu name="File" create_jump_keys="true" label="File"
10 opaque="true" tear_off="true"> 10 opaque="true" tear_off="true">
11 <menu_item_call enabled="false" hidden="false" label="Import" mouse_opaque="true" name="Import">
12 <on_click function="Object.Import" />
13 <on_enable function="Object.EnableImport" />
14 </menu_item_call>
15 <menu_item_call enabled="false" hidden="false" label="Upload + Import" mouse_opaque="true" name="Import">
16 <on_click function="Object.ImportUpload" />
17 <on_enable function="Object.EnableImport" />
18 </menu_item_call>
11 <menu_item_call name="Upload Image" 19 <menu_item_call name="Upload Image"
12 label="Upload Image (L$[COST])..." 20 label="Upload Image (L$[COST])..."
13 shortcut="control|U"> 21 shortcut="control|U">
@@ -126,12 +134,6 @@
126 <on_enable function="Edit.EnableDeselect" /> 134 <on_enable function="Edit.EnableDeselect" />
127 </menu_item_call> 135 </menu_item_call>
128 <menu_item_separator /> 136 <menu_item_separator />
129 <menu_item_call name="Duplicate" enabled="false"
130 label="Duplicate" shortcut="control|D">
131 <on_click function="Edit.Duplicate" userdata="" />
132 <on_enable function="Edit.EnableDuplicate" />
133 </menu_item_call>
134 <menu_item_separator />
135 137
136 <menu name="Attach Object" create_jump_keys="true" 138 <menu name="Attach Object" create_jump_keys="true"
137 label="Attach Object" opaque="true" tear_off="true" /> 139 label="Attach Object" opaque="true" tear_off="true" />
@@ -397,11 +399,17 @@
397 <on_click function="View.ZoomOut" userdata="" /> 399 <on_click function="View.ZoomOut" userdata="" />
398 </menu_item_call> 400 </menu_item_call>
399 </menu> 401 </menu>
400 <menu_item_separator />
401 <menu_item_call name="Toggle Fullscreen" label="Toggle Fullscreen" 402 <menu_item_call name="Toggle Fullscreen" label="Toggle Fullscreen"
402 shortcut="alt|Enter"> 403 shortcut="alt|Enter">
403 <on_click function="View.Fullscreen" userdata="" /> 404 <on_click function="View.Fullscreen" userdata="" />
404 </menu_item_call> 405 </menu_item_call>
406 <menu_item_separator />
407 <menu_item_check name="Toggle Advanced Menu"
408 label="Advanced Menu"
409 shortcut="control|alt|D">
410 <on_click function="View.ToggleAdvanced" userdata="" />
411 <on_check function="View.CheckAdvanced" />
412 </menu_item_check>
405 </menu> 413 </menu>
406 414
407 415
@@ -516,7 +524,7 @@
516 524
517 <menu name="Tools" create_jump_keys="true" label="Tools" 525 <menu name="Tools" create_jump_keys="true" label="Tools"
518 opaque="true" tear_off="true" visible="false"> 526 opaque="true" tear_off="true" visible="false">
519 <menu name="Select Tool" create_jump_keys="true" label="Select Tool" 527 <menu name="Select Tool" create_jump_keys="true" label="Choose Tool"
520 opaque="true" tear_off="true"> 528 opaque="true" tear_off="true">
521 <menu_item_call name="Focus" label="Focus" shortcut="control|1"> 529 <menu_item_call name="Focus" label="Focus" shortcut="control|1">
522 <on_click function="Tools.SelectTool" userdata="focus" /> 530 <on_click function="Tools.SelectTool" userdata="focus" />
@@ -535,48 +543,67 @@
535 </menu_item_call> 543 </menu_item_call>
536 </menu> 544 </menu>
537 <menu_item_separator /> 545 <menu_item_separator />
538 <menu_item_check name="Select Only My Objects" 546 <menu_item_call name="Focus on Selection" enabled="false"
539 label="Select Only My Objects"> 547 label="Focus on Selection" shortcut="H">
540 <on_click function="Tools.SelectOnlyMyObjects" 548 <on_click function="Tools.LookAtSelection" userdata="focus" />
541 userdata="agents" /> 549 <on_enable function="Tools.SomethingSelectedNoHUD" />
542 <on_check control="SelectOwnedOnly" /> 550 </menu_item_call>
543 </menu_item_check> 551 <menu_item_call name="Zoom to Selection" enabled="false"
544 <menu_item_check name="Select Only Movable Objects" 552 label="Zoom to Selection" shortcut="shift|H">
545 label="Select Only Movable Objects"> 553 <on_click function="Tools.LookAtSelection" userdata="zoom" />
546 <on_click function="Tools.SelectOnlyMovableObjects" 554 <on_enable function="Tools.SomethingSelectedNoHUD" />
547 userdata="movable" /> 555 </menu_item_call>
548 <on_check control="SelectMovableOnly" /> 556 <menu name="Selection Options" label="Selection Options"
549 </menu_item_check> 557 create_jump_keys="true" opaque="true" tear_off="true">
550 <menu_item_check name="Select Only Copyable Objects" 558 <menu_item_check name="Select Only My Objects"
551 label="Select Only Copyable Objects"> 559 label="Select Only My Objects">
552 <on_click function="Tools.SelectOnlyCopyableObjects" 560 <on_click function="Tools.SelectOnlyMyObjects"
553 userdata="copyable" /> 561 userdata="agents" />
554 <on_check control="SelectCopyableOnly" /> 562 <on_check control="SelectOwnedOnly" />
555 </menu_item_check> 563 </menu_item_check>
556 <menu_item_check name="Select By Surrounding" 564 <menu_item_check name="Select Only Movable Objects"
557 label="Select By Surrounding"> 565 label="Select Only Movable Objects">
558 <on_click function="Tools.SelectBySurrounding" 566 <on_click function="Tools.SelectOnlyMovableObjects"
559 userdata="" /> 567 userdata="movable" />
560 <on_check control="RectangleSelectInclusive" /> 568 <on_check control="SelectMovableOnly" />
561 </menu_item_check> 569 </menu_item_check>
562 <menu_item_check name="Show Hidden Selection" 570 <menu_item_check name="Select Only Copyable Objects"
563 label="Show Hidden Selection"> 571 label="Select Only Copyable Objects">
564 <on_click function="Tools.ShowHiddenSelection" 572 <on_click function="Tools.SelectOnlyCopyableObjects"
565 userdata="" /> 573 userdata="copyable" />
566 <on_check control="RenderHiddenSelections" /> 574 <on_check control="SelectCopyableOnly" />
567 </menu_item_check> 575 </menu_item_check>
568 <menu_item_check name="Show Light Radius for Selection" 576 <menu_item_check name="Select By Surrounding"
569 label="Show Light Radius for Selection"> 577 label="Select By Surrounding">
570 <on_click function="Tools.ShowSelectionLightRadius" 578 <on_click function="Tools.SelectBySurrounding"
571 userdata="" /> 579 userdata="" />
572 <on_check control="RenderLightRadius" /> 580 <on_check control="RectangleSelectInclusive" />
573 </menu_item_check> 581 </menu_item_check>
574 <menu_item_check name="Show Selection Beam" 582 <menu_item_separator />
575 label="Show Selection Beam"> 583 <menu_item_check name="Show Hidden Selection"
576 <on_click function="ToggleControl" 584 label="Show Hidden Selection">
577 userdata="ShowSelectionBeam" /> 585 <on_click function="Tools.ShowHiddenSelection"
578 <on_check control="ShowSelectionBeam" /> 586 userdata="" />
579 </menu_item_check> 587 <on_check control="RenderHiddenSelections" />
588 </menu_item_check>
589 <menu_item_check name="Show Light Radius for Selection"
590 label="Show Light Radius for Selection">
591 <on_click function="Tools.ShowSelectionLightRadius"
592 userdata="" />
593 <on_check control="RenderLightRadius" />
594 </menu_item_check>
595 <menu_item_check label="Show Selection Outlines"
596 name="Show Selection Outlines">
597 <on_click function="Tools.ShowSelectionHighlights" userdata="" />
598 <on_check control="RenderHighlightSelections" />
599 </menu_item_check>
600 <menu_item_check name="Show Selection Beam"
601 label="Show Selection Beam">
602 <on_click function="ToggleControl"
603 userdata="ShowSelectionBeam" />
604 <on_check control="ShowSelectionBeam" />
605 </menu_item_check>
606 </menu>
580 <menu_item_separator /> 607 <menu_item_separator />
581 <menu_item_check name="Snap to Grid" enabled="false" 608 <menu_item_check name="Snap to Grid" enabled="false"
582 label="Snap to Grid" shortcut="G"> 609 label="Snap to Grid" shortcut="G">
@@ -619,15 +646,10 @@
619 <on_enable function="Tools.EnableUnlink" /> 646 <on_enable function="Tools.EnableUnlink" />
620 </menu_item_call> 647 </menu_item_call>
621 <menu_item_separator /> 648 <menu_item_separator />
622 <menu_item_call name="Focus on Selection" enabled="false" 649 <menu_item_call name="Duplicate" enabled="false"
623 label="Focus on Selection" shortcut="H"> 650 label="Duplicate" shortcut="control|D">
624 <on_click function="Tools.LookAtSelection" userdata="focus" /> 651 <on_click function="Edit.Duplicate" userdata="" />
625 <on_enable function="Tools.SomethingSelectedNoHUD" /> 652 <on_enable function="Edit.EnableDuplicate" />
626 </menu_item_call>
627 <menu_item_call name="Zoom to Selection" enabled="false"
628 label="Zoom to Selection" shortcut="shift|H">
629 <on_click function="Tools.LookAtSelection" userdata="zoom" />
630 <on_enable function="Tools.SomethingSelectedNoHUD" />
631 </menu_item_call> 653 </menu_item_call>
632 <menu_item_call name="Menu Object Take" enabled="false" 654 <menu_item_call name="Menu Object Take" enabled="false"
633 label="Take" visible="false"> 655 label="Take" visible="false">
@@ -639,6 +661,7 @@
639 <on_click function="Tools.TakeCopy" userdata="" /> 661 <on_click function="Tools.TakeCopy" userdata="" />
640 <on_enable function="Tools.EnableTakeCopy" /> 662 <on_enable function="Tools.EnableTakeCopy" />
641 </menu_item_call> 663 </menu_item_call>
664 <menu_item_separator />
642 <menu_item_call name="Return..." enabled="false" 665 <menu_item_call name="Return..." enabled="false"
643 label="Return Object"> 666 label="Return Object">
644 <on_click function="Object.Return" /> 667 <on_click function="Object.Return" />
@@ -695,9 +718,10 @@
695 userdata="stop" /> 718 userdata="stop" />
696 <on_enable function="EditableSelected" /> 719 <on_enable function="EditableSelected" />
697 </menu_item_call> 720 </menu_item_call>
721 <menu_item_separator />
698 <menu_item_call name="Set permissions on selected task inventory" 722 <menu_item_call name="Set permissions on selected task inventory"
699 enabled="false" 723 enabled="false"
700 label="Set permissions on selected task inventory"> 724 label="Bulk Set Permissions">
701 <on_click function="Tools.SetBulkPerms" userdata="" /> 725 <on_click function="Tools.SetBulkPerms" userdata="" />
702 <on_enable function="EditableSelected" /> 726 <on_enable function="EditableSelected" />
703 </menu_item_call> 727 </menu_item_call>
@@ -868,6 +892,25 @@
868 userdata="QuietSnapshotsToDisk" /> 892 userdata="QuietSnapshotsToDisk" />
869 <on_check control="QuietSnapshotsToDisk" /> 893 <on_check control="QuietSnapshotsToDisk" />
870 </menu_item_check> 894 </menu_item_check>
895 <menu_item_call label="Ground Sit" name="Ground Sit"
896 shortcut="control|alt|s">
897 <on_click function="Advanced.ToggleSit" userdata="" />
898 <on_Check function="Advanced.CheckSit" userdata="" />
899 </menu_item_call>
900 <menu_item_check label="Phantom Avatar" name="Phantom"
901 shortcut="control|alt|p">
902 <on_click function="Advanced.TogglePhantom" userdata="" />
903 <on_check function="Advanced.CheckPhantom" userdata="" />
904 </menu_item_check>
905 <menu_item_check label="Animation List" name="Animation List">
906 <on_click function="ShowFloater" userdata="animation list" />
907 <on_check function="FloaterVisible" userdata="animation list" />
908 </menu_item_check>
909 <menu_item_check label="Asset Browser" name="asset browser"
910 shortcut="alt|shift|a">
911 <on_click function="Advanced.ToggleAssetBrowser" userdata="" />
912 <on_check function="Advanced.CheckAssetBrowser" userdata="" />
913 </menu_item_check>
871 <menu_item_check name="Show Mouselook Crosshairs" 914 <menu_item_check name="Show Mouselook Crosshairs"
872 label="Show Mouselook Crosshairs"> 915 label="Show Mouselook Crosshairs">
873 <on_click function="ToggleControl" 916 <on_click function="ToggleControl"
@@ -1351,6 +1394,42 @@
1351 </menu> 1394 </menu>
1352 1395
1353 1396
1397 <!-- RLVa -->
1398
1399 <menu name="RLVa" drop_shadow="true" opaque="true" tear_off="true">
1400
1401 <menu_item_check name="Enable Wear" label="Enable Wear">
1402 <on_click function="ToggleControl" userdata="RLVaEnableWear" />
1403 <on_check control="RLVaEnableWear" />
1404 </menu_item_check>
1405
1406 <menu_item_check name="Hide locked layers" label="Hide locked layers">
1407 <on_click function="ToggleControl" userdata="RLVaHideLockedLayers" />
1408 <on_check control="RLVaHideLockedLayers" />
1409 </menu_item_check>
1410
1411 <menu_item_check name="Hide locked attachments"
1412 label="Hide locked attachments">
1413 <on_click function="ToggleControl"
1414 userdata="RLVaHideLockedAttachments" />
1415 <on_check control="RLVaHideLockedAttachments" />
1416 </menu_item_check>
1417
1418 <!--
1419 <menu_item_check name="Hide locked inventory"
1420 label="Hide locked inventory">
1421 <on_click function="ToggleControl"
1422 userdata="RLVaHideLockedInventory" />
1423 <on_check control="RLVaHideLockedInventory" />
1424 </menu_item_check>
1425 -->
1426
1427 <menu_item_call name="Restrictions..." label="Restrictions...">
1428 <on_click function="RLVa.Behaviors.Show" userdata="" />
1429 </menu_item_call>
1430
1431 </menu>
1432
1354 1433
1355 <!-- UI --> 1434 <!-- UI -->
1356 1435
@@ -1870,6 +1949,13 @@
1870 userdata="ShowConsoleWindow" /> 1949 userdata="ShowConsoleWindow" />
1871 <on_check control="ShowConsoleWindow" /> 1950 <on_check control="ShowConsoleWindow" />
1872 </menu_item_check> 1951 </menu_item_check>
1952
1953 <menu_item_check name="Restrained Life Active"
1954 label="Restrained Life Active">
1955 <on_click function="RLVa.Main.Toggle" />
1956 <on_check function="RLVa.Main.Enabled" />
1957 </menu_item_check>
1958
1873 <menu_item_check name="Output Debug Minidump" 1959 <menu_item_check name="Output Debug Minidump"
1874 label="Output Debug Minidump"> 1960 label="Output Debug Minidump">
1875 <on_click function="ToggleControl" 1961 <on_click function="ToggleControl"
diff --git a/linden/indra/newview/skins/default/xui/en-us/notify.xml b/linden/indra/newview/skins/default/xui/en-us/notify.xml
index 99fe75a..01e2546 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notify.xml
@@ -835,6 +835,11 @@ Use the controls on the right to find things
835and display different backgrounds. 835and display different backgrounds.
836 </message> 836 </message>
837 </notify> 837 </notify>
838 <notify name="FirstMiniMap" tip="false">
839 <message name="message">
840 Right-click the Mini-Map for more options.
841 </message>
842 </notify>
838 <notify name="FirstBuild" tip="false"> 843 <notify name="FirstBuild" tip="false">
839 <message name="message"> 844 <message name="message">
840 You can build new objects in some areas of [SECOND_LIFE]. 845 You can build new objects in some areas of [SECOND_LIFE].
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 a3a4b1a..2ea8890 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
@@ -1,430 +1,414 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<panel bottom="-550" height="486" left="350" name="Panel Avatar" width="430"> 2<panel bottom="-575" height="511" left="350" name="Panel Avatar" width="430">
3 <tab_container bottom="-486" height="486" left="0" mouse_opaque="false" name="tab" 3 <tab_container bottom="-511" height="511" left="0" mouse_opaque="false" name="tab"
4 tab_min_width="50" tab_position="top" width="419"> 4 tab_min_width="50" tab_position="top" width="419">
5 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466" 5 <panel border="true" bottom="-507" follows="left|top|right|bottom" height="491"
6 label="2nd Life" left="1" mouse_opaque="true" name="2nd Life" width="418"> 6 label="2nd Life" left="1" mouse_opaque="true" name="2nd Life" width="418">
7 <string name="CaptionTextAcctInfo"> 7 <string name="CaptionTextAcctInfo">
8 [ACCTTYPE] 8[ACCTTYPE]
9[PAYMENTINFO] 9[PAYMENTINFO]
10[AGEVERIFICATION] 10[AGEVERIFICATION]
11 </string> 11 </string>
12 <string name="AcctTypeResident"> 12 <string name="AcctTypeResident">
13 Resident 13 Resident
14 </string> 14 </string>
15 <string name="AcctTypeTrial"> 15 <string name="AcctTypeTrial">
16 Trial 16 Trial
17 </string> 17 </string>
18 <string name="AcctTypeCharterMember"> 18 <string name="AcctTypeCharterMember">
19 Charter Member 19 Charter Member
20 </string> 20 </string>
21 <string name="AcctTypeEmployee"> 21 <string name="AcctTypeEmployee">
22 Linden Lab Employee 22 Linden Lab Employee
23 </string> 23 </string>
24 <string name="PaymentInfoUsed"> 24 <string name="PaymentInfoUsed">
25 Payment Info Used 25 Payment Info Used
26 </string> 26 </string>
27 <string name="PaymentInfoOnFile"> 27 <string name="PaymentInfoOnFile">
28 Payment Info On File 28 Payment Info On File
29 </string> 29 </string>
30 <string name="NoPaymentInfoOnFile"> 30 <string name="NoPaymentInfoOnFile">
31 No Payment Info On File 31 No Payment Info On File
32 </string> 32 </string>
33 <string name="AgeVerified"> 33 <string name="AgeVerified">
34 Age-verified 34 Age-verified
35 </string> 35 </string>
36 <string name="NotAgeVerified"> 36 <string name="NotAgeVerified">
37 Not Age-verified 37 Not Age-verified
38 </string> 38 </string>
39 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 39 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
40 bottom="-24" drop_shadow_visible="true" follows="left|top" 40 bottom="-23" drop_shadow_visible="true" follows="left|top"
41 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4" 41 font="SansSerifsmall" h_pad="0" halign="left" height="16" right="-15"
42 mouse_opaque="true" name="Name:" v_pad="0" width="70"> 42 mouse_opaque="true" name="online_yes" v_pad="0" width="130">
43 Name: 43 Currently: Online
44 </text> 44 </text>
45 <name_editor bevel_style="in" border_style="line" 45 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
46 border_thickness="1" bottom="-24" enabled="false" follows="left|top" 46 bottom_delta="0" drop_shadow_visible="true" follows="left|top"
47 font="SansSerifSmall" height="16" is_unicode="false" left_delta="75" 47 font="SansSerifsmall" h_pad="0" halign="left" height="16" left_delta="0"
48 max_length="254" mouse_opaque="false" name="name" 48 mouse_opaque="true" name="online_no" v_pad="0" width="130">
49 width="180" /> 49 Currently: Offline
50 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 50 </text>
51 bottom="-24" drop_shadow_visible="true" follows="left|top" 51 <button bottom_delta="-19" font="SansSerif" halign="center" height="20"
52 font="SansSerifsmall" h_pad="0" halign="left" height="16" left="279" 52 label="Instant Message..." label_selected="Instant Message..."
53 mouse_opaque="true" name="online_yes" v_pad="0" width="121"> 53 right="-15" mouse_opaque="true" name="Instant Message..."
54 Currently Online 54 tool_tip="Instant Message (IM)" width="130" />
55 </text> 55 <button bottom_delta="-23" font="SansSerif" halign="center" height="20"
56 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 56 label="Offer Teleport..." label_selected="Offer Teleport..."
57 bottom_delta="-20" drop_shadow_visible="true" follows="left|top" 57 left_delta="0" mouse_opaque="true" name="Offer Teleport..." width="130" />
58 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279" 58 <button bottom_delta="-34" font="SansSerif" halign="center" height="20"
59 mouse_opaque="true" name="label" v_pad="0" width="121"> 59 label="Add to Friends..." label_selected="Add to Friends..." left_delta="0"
60 Born: 60 mouse_opaque="true" name="Add Friend..." width="130" />
61 </text> 61 <button bottom_delta="-23" font="SansSerif" halign="center" height="20"
62 <line_editor bevel_style="in" border_style="line" 62 label="Invite to Group..." label_selected="Invite to Group..." left_delta="0"
63 mouse_opaque="true" name="Invite to Group..." width="130" />
64 <button bottom_delta="-23" font="SansSerif" halign="center" height="20" label="Find on Map"
65 label_selected="Find on Map" left_delta="0" mouse_opaque="true"
66 name="Find on Map" width="130" />
67 <button bottom_delta="-34" font="SansSerif" halign="center" height="20" label="Pay..."
68 label_selected="Pay..." left_delta="0" mouse_opaque="true" name="Pay..."
69 width="130" />
70 <button bottom_delta="-23" font="SansSerif" halign="center" height="20" label="Mute"
71 label_selected="Mute" left_delta="0" mouse_opaque="true" name="Mute"
72 width="130" />
73 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
74 bottom_delta="-29" drop_shadow_visible="true" follows="left|top"
75 font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-15"
76 mouse_opaque="true" name="label" v_pad="0" width="130">
77 Born:
78 </text>
79 <line_editor bevel_style="in" border_style="line"
63 border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top" 80 border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"
64 font="SansSerifSmall" height="16" is_unicode="false" left="279" 81 font="SansSerifSmall" height="18" is_unicode="false" right="-15"
65 max_length="254" mouse_opaque="false" name="born" 82 max_length="254" mouse_opaque="false" name="born"
66 width="121" /> 83 width="130" />
67 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 84 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
68 bottom_delta="-20" drop_shadow_visible="true" follows="left|top" 85 bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
69 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279" 86 font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-15"
70 mouse_opaque="true" name="label2" v_pad="0" width="121"> 87 mouse_opaque="true" name="label2" v_pad="0" width="130">
71 Account: 88 Account:
72 </text> 89 </text>
73 <view_border bevel_style="in" bottom_delta="-48" follows="left|top" height="48" left="279" 90 <view_border bevel_style="in" bottom_delta="-48" follows="left|top" height="50" right="-15"
74 mouse_opaque="false" name="acct_border" width="121" /> 91 mouse_opaque="false" name="acct_border" width="130" />
75 <text bg_visible="false" border_drop_shadow_visible="false" 92 <text bg_visible="false" border_drop_shadow_visible="false"
76 border_visible="true" bottom_delta="0" drop_shadow_visible="true" 93 border_visible="true" bottom_delta="0" drop_shadow_visible="true"
77 follows="left|top" font="SansSerifSmall" height="48" left="279" 94 follows="left|top" font="SansSerifSmall" height="48" left="279"
78 mouse_opaque="false" name="acct" width="121" /> 95 mouse_opaque="false" name="acct" width="121" />
79 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 96 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
80 bottom_delta="-20" drop_shadow_visible="true" follows="left|top" 97 bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
81 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279" 98 font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-15"
82 mouse_opaque="true" name="partner_label" 99 mouse_opaque="true" name="partner_label"
83 tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner" 100 tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
84 v_pad="0" width="130"> 101 v_pad="0" width="130">
85 Partner: 102 Partner:
86 </text> 103 </text>
87 <button bottom_delta="2" follows="left|top" font="SansSerif" halign="center" 104 <button bottom_delta="1" follows="left|top" font="SansSerif" halign="center"
88 height="18" label="i" label_selected="i" left_delta="44" 105 height="18" label="i" label_selected="i" left_delta="44"
89 mouse_opaque="true" name="partner_info" 106 mouse_opaque="true" name="partner_info"
90 tool_tip="Click to open partner&apos;s profile" width="18" /> 107 tool_tip="Click to open partner&apos;s profile" width="20" />
91 <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" 108 <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
92 height="18" label="?" label_selected="?" left_delta="24" 109 height="18" label="?" label_selected="?" left_delta="24"
93 mouse_opaque="true" name="partner_help" width="18" /> 110 mouse_opaque="true" name="partner_help" width="20" />
94 <line_editor bevel_style="in" border_style="line" 111 <line_editor bevel_style="in" border_style="line"
95 border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top" 112 border_thickness="1" bottom_delta="-19" enabled="true" follows="left|top"
96 font="SansSerifSmall" height="16" is_unicode="false" left="279" 113 font="SansSerifSmall" height="18" is_unicode="false" right="-15"
97 max_length="254" mouse_opaque="false" name="partner_edit" 114 max_length="254" mouse_opaque="false" name="partner_edit"
98 tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner" 115 tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
99 width="121"> 116 width="130">
100 [FIRST] [LAST] 117 [FIRST] [LAST]
101 </line_editor> 118 </line_editor>
102 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 119 <texture_picker allow_no_texture="true" bottom="289" can_apply_immediately="false"
103 bottom="-44" drop_shadow_visible="true" follows="left|top" 120 default_image_name="None" follows="left|top" height="192" label=""
104 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4" 121 left="20" mouse_opaque="true" name="img" scale_image="false" auto-resize="false"
105 mouse_opaque="true" name="Photo:" v_pad="0" width="70"> 122 tool_tip="Click to choose a picture" width="235" />
106 Photo: 123 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
107 </text> 124 bottom_delta="-6" drop_shadow_visible="true" follows="left|top"
108 <texture_picker allow_no_texture="true" bottom="-179" can_apply_immediately="false" 125 font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
109 default_image_name="None" follows="left|top" height="151" label="" 126 mouse_opaque="true" name="About:" v_pad="0" width="170">
110 left="79" mouse_opaque="true" name="img" 127 About (500 chars):
111 tool_tip="Click to choose a picture" width="180" /> 128 </text>
112 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 129 <text_editor bottom_delta="-155" embedded_items="false"
113 bottom="-183" drop_shadow_visible="true" follows="left|top" 130 enabled="true" follows="left|top" font="SansSerifSmall" height="155"
114 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4" 131 is_unicode="false" left_delta="0" max_length="511" mouse_opaque="true"
115 mouse_opaque="true" name="Groups:" v_pad="0" width="70"> 132 name="about" width="235" word_wrap="true" />
116 Groups: 133
117 </text> 134 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
118 <scroll_list background_visible="true" bottom="-258" column_padding="5" draw_border="true" 135 bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
119 follows="left|top" height="90" left="79" mouse_opaque="false" 136 font="SansSerifSmall" halign="left" height="16" left="20"
120 multi_select="false" name="groups" width="321" /> 137 mouse_opaque="true" name="Groups:" width="70">
121 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 138 Groups:
122 bottom="-280" drop_shadow_visible="true" follows="left|top" 139 </text>
123 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4" 140 <scroll_list background_visible="true" bottom_delta="-80" column_padding="5" draw_border="true"
124 mouse_opaque="true" name="About:" v_pad="0" width="70"> 141 follows="left|top" height="80" left_delta="0" mouse_opaque="false"
125 About: 142 multi_select="false" name="groups" width="235" />
126 </text> 143 <view_border blevel_style="in" bottom_delta="0" follows="left|top" height="80" right="-15"
127 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 144 mouse_opaque="false" name="drop_target_rect_vis" width="130" />
128 bottom_delta="-16" drop_shadow_visible="true" follows="left|top" 145 <view_border blevel_style="in" border_thickness="0" bottom_delta="0" follows="left|top"
129 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="0" 146 height="80" left_delta="0" mouse_opaque="false" name="drop_target_rect"
130 mouse_opaque="true" name="(500 chars)" v_pad="0" width="70"> 147 width="130" />
131 (500 chars) 148 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
132 </text> 149 bottom_delta="40" drop_shadow_visible="true" follows="left|top"
133 <text_editor bottom="-375" embedded_items="false" 150 font="SansSerifSmall" h_pad="0" halign="center" height="16" right="-22"
134 enabled="true" follows="left|top" font="SansSerifSmall" height="110"
135 is_unicode="false" left="79" max_length="511" mouse_opaque="true"
136 name="about" width="321" word_wrap="true" />
137 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
138 bottom="-403" drop_shadow_visible="true" follows="left|top"
139 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="0"
140 mouse_opaque="true" name="Give item:" v_pad="0" width="75">
141 Give item:
142 </text>
143 <view_border blevel_style="in" border_thickness="0" bottom="-466" follows="left|top"
144 height="466" left_delta="4" mouse_opaque="false" name="drop_target_rect"
145 width="409" />
146 <view_border blevel_style="in" bottom="-403" follows="left|top" height="16" left_delta="75"
147 mouse_opaque="false" name="drop_target_rect_vis" width="321" />
148 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
149 bottom_delta="0" drop_shadow_visible="true" follows="left|top"
150 font="SansSerifSmall" h_pad="0" halign="center" height="16" left_delta="0"
151 mouse_opaque="true" name="Give inventory" 151 mouse_opaque="true" name="Give inventory"
152 tool_tip="Drop inventory items here to give them to this person." v_pad="2" 152 tool_tip="Drop inventory items here to give them to this resident." v_pad="2"
153 width="321"> 153 width="115">
154 Drop inventory item here. 154 Drop inventory here
155 </text> 155 </text>
156 <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" 156 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
157 initial_value="false" label="Show in search" left="75" mouse_opaque="true" 157 bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
158 font="SansSerifSmall" h_pad="0" halign="center" height="16" left_delta="0"
159 mouse_opaque="true" name="Give inventory 2" width="115"
160 tool_tip="Drop inventory items here to give them to this resident.">
161 to give to resident
162 </text>
163 <name_editor bevel_style="in" border_style="line"
164 border_thickness="0" bottom="0" enabled="false" follows="left|top"
165 font="SansSerifSmall" height="0" is_unicode="false" left="1"
166 max_length="254" mouse_opaque="false" name="name"
167 width="0" />
168 <check_box bottom="1" follows="left|top" font="SansSerifSmall" height="16"
169 initial_value="false" label="Show profile in search" left="18" mouse_opaque="true"
158 name="allow_publish" 170 name="allow_publish"
159 tool_tip="Publish extra profile information such as description and image in Search." 171 tool_tip="Publish extra profile information such as description and image in Search."
160 width="130" /> 172 width="130" />
161 <button bottom="-425" follows="left|top" font="SansSerif" halign="center" height="20" 173 <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" height="18"
162 label="?" label_selected="?" left_delta="145" mouse_opaque="true" name="?" 174 label="?" label_selected="?" left_delta="150" mouse_opaque="true" name="?"
163 width="20" /> 175 width="20" />
164 <button bottom="-428" font="SansSerif" halign="center" height="20" label="Find on Map" 176 </panel>
165 label_selected="Find on Map" left="24" mouse_opaque="true" 177 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
166 name="Find on Map" width="100" /> 178 label="Web" left="1" mouse_opaque="true" name="WebProfile" width="418">
167 <button bottom="-428" font="SansSerif" halign="center" height="20" 179 <line_editor bevel_style="in" border_style="line"
168 label="Offer Teleport..." label_selected="Offer Teleport..."
169 left_delta="102" mouse_opaque="true" name="Offer Teleport..." width="140" />
170 <button bottom="-428" font="SansSerif" halign="center" height="20"
171 label="Add Friend..." label_selected="Add Friend..." left_delta="142"
172 mouse_opaque="true" name="Add Friend..." width="130" />
173 <button bottom_delta="-24" font="SansSerif" halign="center" height="20" label="Pay..."
174 label_selected="Pay..." left="24" mouse_opaque="true" name="Pay..."
175 width="100" />
176 <button bottom_delta="0" font="SansSerif" halign="center" height="20"
177 label="Instant Message..." label_selected="Instant Message..."
178 left_delta="102" mouse_opaque="true" name="Instant Message..."
179 tool_tip="Instant Message (IM)" width="140" />
180 <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Mute"
181 label_selected="Mute" left_delta="142" mouse_opaque="true" name="Mute"
182 width="130" />
183 </panel>
184 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
185 label="Web" left="1" mouse_opaque="true" name="WebProfile" width="418">
186 <line_editor bevel_style="in" border_style="line"
187 border_thickness="1" bottom_delta="-18" enabled="false" follows="left|top" 180 border_thickness="1" bottom_delta="-18" enabled="false" follows="left|top"
188 font="SansSerifSmall" height="16" is_unicode="false" left="10" 181 font="SansSerifSmall" height="16" is_unicode="false" left="10"
189 max_length="254" mouse_opaque="true" name="url_edit" 182 max_length="254" mouse_opaque="true" name="url_edit"
190 width="400" /> 183 width="400" />
191 <flyout_button bottom_delta="-22" follows="left|top" font="SansSerifSmall" halign="center" 184 <flyout_button bottom_delta="-22" follows="left|top" font="SansSerifSmall" halign="center"
192 height="18" label="Load" label_selected="Load" left="10" 185 height="18" label="Load" label_selected="Load" left="10"
193 mouse_opaque="true" name="load" enabled="false" 186 mouse_opaque="true" name="load" enabled="false"
194 tool_tip="Load this profile page with embedded web browser." width="80" > 187 tool_tip="Load this profile page with embedded web browser." width="80" >
195 <flyout_button_item value="open" name="open_item">In external browser</flyout_button_item> 188 <flyout_button_item value="open" name="open_item">In external browser</flyout_button_item>
196 <flyout_button_item value="home" name="home_item">Home URL</flyout_button_item> 189 <flyout_button_item value="home" name="home_item">Home URL</flyout_button_item>
197 </flyout_button> 190 </flyout_button>
198 <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" 191 <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
199 height="18" label="?" label_selected="?" left_delta="85" 192 height="18" label="?" label_selected="?" left_delta="85"
200 mouse_opaque="true" name="web_profile_help" width="18" /> 193 mouse_opaque="true" name="web_profile_help" width="18" />
201 <check_box bottom_delta="0" follows="right|top" font="SansSerifSmall" height="16" 194 <check_box bottom_delta="0" follows="right|top" font="SansSerifSmall" height="16"
202 initial_value="false" label="Automatically load web profiles" 195 initial_value="false" label="Automatically load web profiles"
203 left_delta="30" mouse_opaque="true" name="auto_load" 196 left_delta="30" mouse_opaque="true" name="auto_load"
204 tool_tip="Automatically load ALL profile webpages without asking first." 197 tool_tip="Automatically load ALL profile webpages without asking first."
205 width="127" /> 198 width="127" />
206 <web_browser border_visible="false" bottom="-444" follows="top|left|right" height="400" 199 <web_browser border_visible="false" bottom="-444" follows="top|left|right" height="400"
207 ignore_ui_scale="false" left="10" name="profile_html" start_url="" 200 ignore_ui_scale="false" left="10" name="profile_html" start_url=""
208 width="400" /> 201 width="400" />
209 <text bottom="5" follows="bottom|left|right" left="15" name="status_text" right="-70" 202 <text bottom="5" follows="bottom|left|right" left="15" name="status_text" right="-70"
210 top="25" /> 203 top="25" />
211 </panel> 204 </panel>
212 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466" 205 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
213 label="Interests" left="1" mouse_opaque="true" name="Interests" width="418"> 206 label="Interests" left="1" mouse_opaque="true" name="Interests" width="418">
214 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 207 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
215 bottom="-36" drop_shadow_visible="true" follows="left|top" 208 bottom="-36" drop_shadow_visible="true" follows="left|top"
216 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4" 209 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
217 mouse_opaque="true" name="I Want To:" v_pad="0" width="70"> 210 mouse_opaque="true" name="I Want To:" v_pad="0" width="70">
218 I Want To: 211 I Want To:
219 </text> 212 </text>
220 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16" 213 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
221 initial_value="false" label="Build" left_delta="70" mouse_opaque="true" 214 initial_value="false" label="Build" left_delta="70" mouse_opaque="true"
222 name="chk0" width="90" /> 215 name="chk0" width="90" />
223 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16" 216 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
224 initial_value="false" label="Explore" left_delta="170" mouse_opaque="true" 217 initial_value="false" label="Explore" left_delta="170" mouse_opaque="true"
225 name="chk1" width="90" /> 218 name="chk1" width="90" />
226 <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" 219 <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
227 initial_value="false" label="Meet" left_delta="-170" mouse_opaque="true" 220 initial_value="false" label="Meet" left_delta="-170" mouse_opaque="true"
228 name="chk2" width="57" /> 221 name="chk2" width="57" />
229 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16" 222 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
230 initial_value="false" label="Be Hired" left_delta="170" mouse_opaque="true" 223 initial_value="false" label="Be Hired" left_delta="170" mouse_opaque="true"
231 name="chk6" width="92" /> 224 name="chk6" width="92" />
232 <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" 225 <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
233 initial_value="false" label="Group" left_delta="-170" mouse_opaque="true" 226 initial_value="false" label="Group" left_delta="-170" mouse_opaque="true"
234 name="chk3" width="90" /> 227 name="chk3" width="90" />
235 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16" 228 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
236 initial_value="false" label="Buy" left_delta="170" mouse_opaque="true" 229 initial_value="false" label="Buy" left_delta="170" mouse_opaque="true"
237 name="chk4" width="90" /> 230 name="chk4" width="90" />
238 <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" 231 <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
239 initial_value="false" label="Sell" left_delta="-170" mouse_opaque="true" 232 initial_value="false" label="Sell" left_delta="-170" mouse_opaque="true"
240 name="chk5" width="50" /> 233 name="chk5" width="50" />
241 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16" 234 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
242 initial_value="false" label="Hire" left_delta="170" mouse_opaque="true" 235 initial_value="false" label="Hire" left_delta="170" mouse_opaque="true"
243 name="chk7" width="92" /> 236 name="chk7" width="92" />
244 <line_editor bevel_style="in" border_style="line" 237 <line_editor bevel_style="in" border_style="line"
245 border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top" 238 border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
246 font="SansSerifSmall" height="16" is_unicode="false" left="74" 239 font="SansSerifSmall" height="16" is_unicode="false" left="74"
247 max_length="254" mouse_opaque="true" name="want_to_edit" 240 max_length="254" mouse_opaque="true" name="want_to_edit"
248 width="330" /> 241 width="330" />
249 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 242 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
250 bottom_delta="-26" drop_shadow_visible="true" follows="left|top" 243 bottom_delta="-26" drop_shadow_visible="true" follows="left|top"
251 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4" 244 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
252 mouse_opaque="true" name="Skills:" v_pad="0" width="70"> 245 mouse_opaque="true" name="Skills:" v_pad="0" width="70">
253 Skills: 246 Skills:
254 </text> 247 </text>
255 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16" 248 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
256 initial_value="false" label="Textures" left_delta="70" mouse_opaque="true" 249 initial_value="false" label="Textures" left_delta="70" mouse_opaque="true"
257 name="schk0" width="90" /> 250 name="schk0" width="90" />
258 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16" 251 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
259 initial_value="false" label="Architecture" left_delta="170" 252 initial_value="false" label="Architecture" left_delta="170"
260 mouse_opaque="true" name="schk1" width="93" /> 253 mouse_opaque="true" name="schk1" width="93" />
261 <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" 254 <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
262 initial_value="false" label="Event Planning" left_delta="0" 255 initial_value="false" label="Event Planning" left_delta="0"
263 mouse_opaque="true" name="schk2" width="105" /> 256 mouse_opaque="true" name="schk2" width="105" />
264 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16" 257 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
265 initial_value="false" label="Modeling" left_delta="-170" 258 initial_value="false" label="Modeling" left_delta="-170"
266 mouse_opaque="true" name="schk3" width="90" /> 259 mouse_opaque="true" name="schk3" width="90" />
267 <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" 260 <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
268 initial_value="false" label="Scripting" left_delta="0" mouse_opaque="true" 261 initial_value="false" label="Scripting" left_delta="0" mouse_opaque="true"
269 name="schk4" width="90" /> 262 name="schk4" width="90" />
270 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16" 263 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
271 initial_value="false" label="Custom Characters" left_delta="170" 264 initial_value="false" label="Custom Characters" left_delta="170"
272 mouse_opaque="true" name="schk5" width="127" /> 265 mouse_opaque="true" name="schk5" width="127" />
273 <line_editor bevel_style="in" border_style="line" 266 <line_editor bevel_style="in" border_style="line"
274 border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top" 267 border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
275 font="SansSerifSmall" height="16" is_unicode="false" left="74" 268 font="SansSerifSmall" height="16" is_unicode="false" left="74"
276 max_length="254" mouse_opaque="true" name="skills_edit" 269 max_length="254" mouse_opaque="true" name="skills_edit"
277 width="330" /> 270 width="330" />
278 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 271 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
279 bottom_delta="-30" drop_shadow_visible="true" follows="left|top" 272 bottom_delta="-30" drop_shadow_visible="true" follows="left|top"
280 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4" 273 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
281 mouse_opaque="true" name="Languages:" v_pad="0" width="70"> 274 mouse_opaque="true" name="Languages:" v_pad="0" width="70">
282 Languages: 275 Languages:
283 </text> 276 </text>
284 <line_editor bevel_style="in" border_style="line" 277 <line_editor bevel_style="in" border_style="line"
285 border_thickness="1" bottom_delta="0" enabled="true" follows="left|top" 278 border_thickness="1" bottom_delta="0" enabled="true" follows="left|top"
286 font="SansSerifSmall" height="16" is_unicode="false" left="74" 279 font="SansSerifSmall" height="16" is_unicode="false" left="74"
287 max_length="254" mouse_opaque="true" name="languages_edit" 280 max_length="254" mouse_opaque="true" name="languages_edit"
288 width="330" /> 281 width="330" />
289 </panel> 282 </panel>
290 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466" 283 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
291 label="Picks" left="1" mouse_opaque="true" name="Picks" width="418"> 284 label="Picks" left="1" mouse_opaque="true" name="Picks" width="418">
292 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 285 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
293 bottom="-20" drop_shadow_visible="true" follows="left|top" 286 bottom="-20" drop_shadow_visible="true" follows="left|top"
294 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="114" 287 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="114"
295 mouse_opaque="true" 288 mouse_opaque="true"
296 name="Tell everyone about your favorite places in Second Life." v_pad="0" 289 name="Tell everyone about your favorite places in Second Life." v_pad="0"
297 width="302"> 290 width="302">
298 Tell everyone about your favorite places in Second Life. 291 Tell everyone about your favorite places in Second Life.
299 </text> 292 </text>
300 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center" 293 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
301 height="20" label="New..." label_selected="New..." left="114" 294 height="20" label="New..." label_selected="New..." left="114"
302 mouse_opaque="true" name="New..." width="75" /> 295 mouse_opaque="true" name="New..." width="75" />
303 <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20" 296 <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"
304 label="Delete..." label_selected="Delete..." left_delta="79" 297 label="Delete..." label_selected="Delete..." left_delta="79"
305 mouse_opaque="true" name="Delete..." width="75" /> 298 mouse_opaque="true" name="Delete..." width="75" />
306 <tab_container bottom="-411" follows="left|top" height="363" left="4" mouse_opaque="false" 299 <tab_container bottom="-411" follows="left|top" height="363" left="4" mouse_opaque="false"
307 name="picks tab" tab_position="left" width="412" /> 300 name="picks tab" tab_position="left" width="412" />
308 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 301 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
309 bottom="-70" drop_shadow_visible="true" follows="left|top" font="SansSerif" 302 bottom="-70" drop_shadow_visible="true" follows="left|top" font="SansSerif"
310 h_pad="0" halign="left" height="20" left="114" mouse_opaque="false" 303 h_pad="0" halign="left" height="20" left="114" mouse_opaque="false"
311 name="loading_text" v_pad="0" width="302"> 304 name="loading_text" v_pad="0" width="302">
312 Loading... 305 Loading...
313 </text> 306 </text>
314 </panel> 307 </panel>
315 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466" 308 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
316 label="Classified" left="1" mouse_opaque="true" name="Classified" 309 label="Classified" left="1" mouse_opaque="true" name="Classified"
317 width="418"> 310 width="418">
318 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 311 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
319 bottom="-20" drop_shadow_visible="true" follows="left|top" 312 bottom="-20" drop_shadow_visible="true" follows="left|top"
320 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="114" 313 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="114"
321 mouse_opaque="true" 314 mouse_opaque="true"
322 name="Place an ad in Second Life&apos;s classified listings." v_pad="0" 315 name="Place an ad in Second Life&apos;s classified listings." v_pad="0"
323 width="302"> 316 width="302">
324 Place an ad in Second Life&apos;s classified listings. 317 Place an ad in Second Life&apos;s classified listings.
325 </text> 318 </text>
326 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center" 319 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
327 height="20" label="New..." label_selected="New..." left="114" 320 height="20" label="New..." label_selected="New..." left="114"
328 mouse_opaque="true" name="New..." width="75" /> 321 mouse_opaque="true" name="New..." width="75" />
329 <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20" 322 <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"
330 label="Delete..." label_selected="Delete..." left_delta="79" 323 label="Delete..." label_selected="Delete..." left_delta="79"
331 mouse_opaque="true" name="Delete..." width="75" /> 324 mouse_opaque="true" name="Delete..." width="75" />
332 <tab_container bottom="-443" follows="left|top" height="395" left="4" mouse_opaque="false" 325 <tab_container bottom="-443" follows="left|top" height="395" left="4" mouse_opaque="false"
333 name="classified tab" tab_position="left" width="412" /> 326 name="classified tab" tab_position="left" width="412" />
334 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 327 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
335 bottom="-70" drop_shadow_visible="true" follows="left|top" font="SansSerif" 328 bottom="-70" drop_shadow_visible="true" follows="left|top" font="SansSerif"
336 h_pad="0" halign="left" height="20" left="114" mouse_opaque="false" 329 h_pad="0" halign="left" height="20" left="114" mouse_opaque="false"
337 name="loading_text" v_pad="0" width="302"> 330 name="loading_text" v_pad="0" width="302">
338 Loading... 331 Loading...
339 </text> 332 </text>
340 </panel> 333 </panel>
341 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466" 334 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
342 label="1st Life" left="1" mouse_opaque="true" name="1st Life" width="418"> 335 label="1st Life" left="1" mouse_opaque="true" name="1st Life" width="418">
343 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 336 <texture_picker allow_no_texture="true" bottom="220" can_apply_immediately="false"
344 bottom="-36" drop_shadow_visible="true" follows="left|top" 337 default_image_name="None" follows="left|top" height="235" label=""
345 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4" 338 left="20" mouse_opaque="true" name="img"
346 mouse_opaque="true" name="Photo:" v_pad="0" width="61"> 339 tool_tip="Click to choose a picture" width="235" />
347 Photo: 340 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
348 </text> 341 bottom_delta="-8" drop_shadow_visible="true" follows="left|top"
349 <texture_picker allow_no_texture="true" bottom="-171" can_apply_immediately="false" 342 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="20"
350 default_image_name="None" follows="left|top" height="151" label="" 343 mouse_opaque="true" name="Info:" v_pad="0" width="161">
351 left="70" mouse_opaque="true" name="img" 344 Info (250 chars):
352 tool_tip="Click to choose a picture" width="135" /> 345 </text>
353 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 346 <text_editor bottom_delta="-179" embedded_items="false"
354 bottom="-203" drop_shadow_visible="true" follows="left|top" 347 enabled="true" follows="left|top" font="SansSerifSmall" height="178"
355 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4" 348 is_unicode="false" left="20" max_length="254" mouse_opaque="false"
356 mouse_opaque="true" name="Info:" v_pad="0" width="61"> 349 name="about" width="378" word_wrap="true" />
357 Info: 350 </panel>
358 </text> 351 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
359 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
360 bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
361 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="0"
362 mouse_opaque="true" name="(250 chars)" v_pad="0" width="65">
363 (250 chars)
364 </text>
365 <text_editor bottom="-347" embedded_items="false"
366 enabled="true" follows="left|top" font="SansSerifSmall" height="160"
367 is_unicode="false" left="70" max_length="254" mouse_opaque="false"
368 name="about" width="330" word_wrap="true" />
369 </panel>
370 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
371 label="My Notes" left="1" mouse_opaque="true" name="My Notes" width="418"> 352 label="My Notes" left="1" mouse_opaque="true" name="My Notes" width="418">
372 <string name="Loading"> 353 <string name="Loading">
373 Loading... 354 Loading...
374 </string> 355 </string>
375 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 356 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
376 bottom="-52" drop_shadow_visible="true" follows="left|top" 357 bottom="-52" drop_shadow_visible="true" follows="left|top"
377 font="SansSerifSmall" h_pad="0" halign="left" height="48" left="10" 358 font="SansSerifSmall" h_pad="0" halign="left" height="48" left="10"
378 mouse_opaque="true" name="label" v_pad="0" width="412"> 359 mouse_opaque="true" name="label" v_pad="0" width="412">
379 Use this space to record your notes about this person. Keep track 360 Use this space to record your notes about this person. Keep track
380of trades in progress, joint projects, etc. Only you can see these 361 of trades in progress, joint projects, etc. Only you can see these
381notes. This person cannot see them, nor can other people. 362 notes. This person cannot see them, nor can other people.
382 </text> 363 </text>
383 <text_editor bottom_delta="-260" embedded_items="false" enabled="true" follows="left|top" 364 <text_editor bottom_delta="-260" embedded_items="false" enabled="true" follows="left|top"
384 font="SansSerif" height="256" is_unicode="false" left="10" 365 font="SansSerif" height="256" is_unicode="false" left="10"
385 max_length="1023" mouse_opaque="true" name="notes edit" width="400" 366 max_length="1023" mouse_opaque="true" name="notes edit" width="400"
386 word_wrap="false" /> 367 word_wrap="false" />
387 </panel> 368 </panel>
388 </tab_container> 369 </tab_container>
389 <button bottom="-483" font="SansSerif" halign="center" height="20" label="OK" 370 <button bottom="-508" font="SansSerif" halign="center" height="20" label="OK"
390 label_selected="OK" left="208" mouse_opaque="true" name="OK" width="100" /> 371 label_selected="OK" left="208" mouse_opaque="true" name="OK" width="100" />
391 <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Cancel" 372 <button bottom="-508" font="SansSerif" halign="center" height="20" label="Cancel"
392 label_selected="Cancel" left_delta="105" mouse_opaque="true" name="Cancel" 373 label_selected="Cancel" left_delta="105" mouse_opaque="true" name="Cancel"
393 width="100" /> 374 width="100" />
394 <button bottom_delta="132" font="SansSerif" halign="center" height="20" label="Kick" 375 <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Kick"
395 label_selected="Kick" left="4" mouse_opaque="true" name="Kick" width="72" /> 376 label_selected="Kick" left="4" mouse_opaque="true" name="Kick" width="72" />
396 <button bottom_delta="-24" font="SansSerif" halign="center" height="20" label="Freeze" 377 <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Freeze"
397 label_selected="Freeze" left="4" mouse_opaque="true" name="Freeze" 378 label_selected="Freeze" left_delta="76" mouse_opaque="true" name="Freeze"
398 tool_tip="Stop this resident&apos;s movement and chat." width="72" /> 379 tool_tip="Stop this resident&apos;s movement and chat." width="72" />
399 <button bottom_delta="-24" font="SansSerif" halign="center" height="20" 380 <button bottom_delta="0" font="SansSerif" halign="center" height="20"
400 label="Unfreeze" label_selected="Unfreeze" left="4" mouse_opaque="true" 381 label="Unfreeze" label_selected="Unfreeze" left_delta="76" mouse_opaque="true"
401 name="Unfreeze" tool_tip="Thaw resident" width="72" /> 382 name="Unfreeze" tool_tip="Thaw resident" width="72" />
402 <button bottom_delta="-24" font="SansSerif" halign="center" height="20" label="CSR" 383 <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="CSR"
403 label_selected="CSR" left="4" mouse_opaque="true" name="csr_btn" 384 label_selected="CSR" left_delta="76" mouse_opaque="true" name="csr_btn"
404 tool_tip="Open customer service tool for this resident" width="72" /> 385 tool_tip="Open customer service tool for this resident" width="72" />
405 <string name="ShowOnMapNonFriend"> 386 <string name="ShowOnMapNonFriend">
406 Show location on the map. 387 Show location on the map.
407Disabled because you have not 388 Disabled because you have not
408formed a friendship with them. 389 formed a friendship with them.
409 </string> 390 </string>
410 <string name="ShowOnMapFriendOffline"> 391 <string name="ShowOnMapFriendOffline">
411 Show location on the map. 392 Show location on the map.
412 Disabled because they are not online. 393 Disabled because they are not online.
413 </string> 394 </string>
414 <string name="ShowOnMapFriendOnline"> 395 <string name="ShowOnMapFriendOnline">
415 Show location on the map. 396 Show location on the map.
416 </string> 397 </string>
417 <string name="TeleportGod"> 398 <string name="TeleportGod">
418 Force a teleport to your location. 399 Force a teleport to your location.
419 </string> 400 </string>
420 <string name="TeleportPrelude"> 401 <string name="TeleportPrelude">
421 Offer a teleport to your location. 402 Offer a teleport to your location.
422Disabled until you leave Orientation Island. 403 Disabled until you leave Orientation Island.
423 </string> 404 </string>
424 <string name="TeleportNormal"> 405 <string name="TeleportNormal">
425 Offer a teleport to your location. 406 Offer a teleport to your location.
426 </string> 407 </string>
427 <string name="Loading"> 408 <string name="Loading">
428 Loading... 409 Loading...
429 </string> 410 </string>
411 <string name="HiddenLabel">
412 (hidden)
413 </string>
430</panel> 414</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
index 464ecac..ac3a74a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
@@ -8,13 +8,17 @@
8 <button bottom="-23" follows="left|bottom" font="SansSerif" halign="center" height="20" 8 <button bottom="-23" follows="left|bottom" font="SansSerif" halign="center" height="20"
9 label="Local Chat" left="7" name="History" 9 label="Local Chat" left="7" name="History"
10 tool_tip="Click here to see what has been said" width="93" /> 10 tool_tip="Click here to see what has been said" width="93" />
11 <spinner bottom="-24" decimal_digits="0" follows="left|bottom" height="20"
12 increment="1.00" initial_val="0" label="Channel" label_width="50" left="107"
13 max_val="2147483647" min_val="0" mouse_opaque="true" name="channel_control"
14 width="100" tool_tip="Set the default channel for inworld chat"/>
11 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-23" 15 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-23"
12 follows="left|right|bottom" font="SansSerif" 16 follows="left|right|bottom" font="SansSerif"
13 handle_edit_keys_directly="false" height="20" label="Click here to chat." 17 handle_edit_keys_directly="false" height="20" label="Click here to chat."
14 left="107" max_length="254" name="Chat Editor" 18 left="212" max_length="254" name="Chat Editor"
15 select_all_on_focus_received="false" select_on_focus="false" tab_group="1" 19 select_all_on_focus_received="false" select_on_focus="false" tab_group="1"
16 tool_tip="Press Enter to say, Ctrl-Enter to shout." width="105" /> 20 tool_tip="Press Enter to say, Ctrl-Enter to shout." width="5" />
17 <flyout_button bottom="-23" follows="right|bottom" height="20" label="Say" left_delta="109" 21 <flyout_button bottom="-23" follows="right|bottom" height="20" label="Say" left_delta="4"
18 list_position="above" mouse_opaque="true" name="Say" tool_tip="(Enter)" 22 list_position="above" mouse_opaque="true" name="Say" tool_tip="(Enter)"
19 width="80"> 23 width="80">
20 <flyout_button_item value="shout" name="shout_item"> 24 <flyout_button_item value="shout" name="shout_item">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
new file mode 100644
index 0000000..19faa62
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
@@ -0,0 +1,62 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<panel background_opaque="false" background_visible="true" bg_alpha_color="NetMapBackgroundColor"
3 border="false" follows="left|top|right|bottom" height="716" label="Mini Map"
4 mouse_opaque="false" name="mini_mapview" width="196">
5 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
6 bottom="-40" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
7 halign="left" height="10" left="80" mouse_opaque="false" name="n_label"
8 text_enabled_color="1, 1, 1, 0.7" v_pad="0" width="10">
9 N
10 </text>
11 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
12 bottom="-80" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
13 halign="left" height="10" left="120" mouse_opaque="false" name="e_label"
14 text_enabled_color="1, 1, 1, 0.7" v_pad="0" width="10">
15 E
16 </text>
17 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
18 bottom="-120" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
19 halign="left" height="10" left="80" mouse_opaque="false" name="s_label"
20 text_enabled_color="1, 1, 1, 0.7" v_pad="0" width="10">
21 S
22 </text>
23 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
24 bottom="-80" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
25 halign="left" height="10" left="40" mouse_opaque="false" name="w_label"
26 text_enabled_color="1, 1, 1, 0.7" v_pad="0" width="11">
27 W
28 </text>
29 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
30 bottom="-60" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
31 halign="left" height="10" left="100" mouse_opaque="false" name="ne_label"
32 text_enabled_color="1, 1, 1, 0.7" v_pad="0" width="20">
33 NE
34 </text>
35 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
36 bottom="-100" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
37 halign="left" height="10" left="100" mouse_opaque="false" name="se_label"
38 text_enabled_color="1, 1, 1, 0.7" v_pad="0" width="20">
39 SE
40 </text>
41 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
42 bottom="-100" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
43 halign="left" height="10" left="60" mouse_opaque="false" name="sw_label"
44 text_enabled_color="1, 1, 1, 0.7" v_pad="0" width="21">
45 SW
46 </text>
47 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
48 bottom="-60" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
49 halign="left" height="1-" left="60" mouse_opaque="false" name="nw_label"
50 text_enabled_color="1, 1, 1, 0.7" v_pad="0" width="21">
51 NW
52 </text>
53 <string name="tooltip_tp">
54 Double-Click teleports
55 </string>
56 <string name="tooltip_pan">
57 Shift-Drag pans
58 </string>
59 <string name="tooltip_map">
60 Double-Click opens Map
61 </string>
62</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
index e785909..8ad4fff 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
@@ -45,16 +45,21 @@
45 use_bounding_rect="true" width="395" /> 45 use_bounding_rect="true" width="395" />
46 </layout_stack> 46 </layout_stack>
47 </layout_panel> 47 </layout_panel>
48 <layout_panel auto_resize="false" bottom="0" left="0" min_width="220" mouse_opaque="false" 48 <layout_panel auto_resize="false" bottom="0" left="0" min_width="184" mouse_opaque="false"
49 name="windlight_remote_container" use_bounding_rect="true" user_resize="false"
50 width="186">
51 <panel background_visible="false" border="false" bottom="0" name="windlight_remote" />
52 </layout_panel>
53 <layout_panel auto_resize="false" bottom="0" left="0" min_width="220" mouse_opaque="false"
49 name="media_remote_container" use_bounding_rect="true" user_resize="false" 54 name="media_remote_container" use_bounding_rect="true" user_resize="false"
50 width="220"> 55 width="220">
51 <panel background_visible="false" border="false" bottom="0" name="media_remote" /> 56 <panel background_visible="false" border="false" bottom="0" name="media_remote" />
52 </layout_panel> 57 </layout_panel>
53 <layout_panel auto_resize="false" bottom="0" left="0" min_width="130" mouse_opaque="false" 58 <layout_panel auto_resize="false" bottom="0" left="0" min_width="130" mouse_opaque="false"
54 name="voice_remote_container" use_bounding_rect="true" user_resize="false" 59 name="voice_remote_container" use_bounding_rect="true" user_resize="false"
55 width="128"> 60 width="128">
56 <panel background_visible="false" border="false" bottom="0" name="voice_remote" /> 61 <panel background_visible="false" border="false" bottom="0" name="voice_remote" />
57 </layout_panel> 62 </layout_panel>
58 </layout_stack> 63 </layout_stack>
59 <string name="unread_count_string_plural"> 64 <string name="unread_count_string_plural">
60 New IMs 65 New IMs
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
index 92978ab..c960d36 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
@@ -15,7 +15,7 @@
15 Streaming Preferences: 15 Streaming Preferences:
16 </text> 16 </text>
17 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 17 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
18 bottom="-280" drop_shadow_visible="true" enabled="true" follows="left|top" 18 bottom="-300" drop_shadow_visible="true" enabled="true" follows="left|top"
19 font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10" 19 font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
20 mouse_opaque="true" name="audio_prefs_text" v_pad="0" width="128"> 20 mouse_opaque="true" name="audio_prefs_text" v_pad="0" width="128">
21 Audio Preferences: 21 Audio Preferences:
@@ -28,6 +28,10 @@
28 label="Play Streaming Music When Available (uses more bandwidth)" 28 label="Play Streaming Music When Available (uses more bandwidth)"
29 left="142" mouse_opaque="true" name="streaming_music" radio_style="false" 29 left="142" mouse_opaque="true" name="streaming_music" radio_style="false"
30 width="339" /> 30 width="339" />
31 <check_box bottom_delta="-20" control_name="ShowStreamTitle" enabled="true"
32 follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
33 label="Show stream info in chat" left="162" mouse_opaque="true"
34 name="show_stream_title" radio_style="false" width="338" />
31 <check_box bottom_delta="-20" control_name="AudioStreamingVideo" enabled="true" 35 <check_box bottom_delta="-20" control_name="AudioStreamingVideo" enabled="true"
32 follows="left|top" font="SansSerifSmall" height="16" initial_value="true" 36 follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
33 label="Play Streaming Media When Available (uses more bandwidth)" 37 label="Play Streaming Media When Available (uses more bandwidth)"
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 24753d1..b0384cf 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
@@ -131,30 +131,34 @@
131 follows="left|top" font="SansSerifSmall" height="16" initial_value="false" 131 follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
132 label="Close chat bar after hitting return" left="148" mouse_opaque="true" 132 label="Close chat bar after hitting return" left="148" mouse_opaque="true"
133 name="close_chat_on_return_check" radio_style="false" width="237" /> 133 name="close_chat_on_return_check" radio_style="false" width="237" />
134 <check_box bottom_delta="-20" enabled="true" 134 <check_box bottom_delta="-18" enabled="true"
135 follows="left|top" font="SansSerifSmall" height="16" initial_value="false" 135 follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
136 label="Arrow keys always move avatar when chatting" left="148" 136 label="Arrow keys always move avatar when chatting" left="148"
137 mouse_opaque="true" name="arrow_keys_move_avatar_check" radio_style="false" 137 mouse_opaque="true" name="arrow_keys_move_avatar_check" radio_style="false"
138 width="237" /> 138 width="237" />
139 <check_box bottom_delta="-20" enabled="true" 139 <check_box bottom_delta="-18" enabled="true"
140 follows="left|top" font="SansSerifSmall" height="16" initial_value="false" 140 follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
141 label="Show timestamps in Local Chat" left="148" mouse_opaque="true" 141 label="Show timestamps in Local Chat" left="148" mouse_opaque="true"
142 name="show_timestamps_check" radio_style="false" width="237" /> 142 name="show_timestamps_check" radio_style="false" width="237" />
143 <check_box bottom_delta="-20" enabled="true" 143 <check_box bottom_delta="-18" enabled="true"
144 follows="left|top" font="SansSerifSmall" height="16" initial_value="true" 144 follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
145 label="Play typing animation when chatting" left="148" mouse_opaque="true" 145 label="Play typing animation when chatting" left="148" mouse_opaque="true"
146 name="play_typing_animation" radio_style="false" width="237" /> 146 name="play_typing_animation" radio_style="false" width="237" />
147 <check_box bottom_delta="-18" enabled="true" follows="left|top"
148 font="SansSerifSmall" height="16" initial_value="false"
149 label="Show custom chat channel" left="148" mouse_opaque="true"
150 name="toggle_channel_control" radio_style="false" width="237" />
147 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 151 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
148 bottom="-369" drop_shadow_visible="true" enabled="true" follows="left|top" 152 bottom="-379" drop_shadow_visible="true" enabled="true" follows="left|top"
149 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12" 153 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
150 mouse_opaque="false" name="text_box7" v_pad="0" width="128"> 154 mouse_opaque="false" name="text_box7" v_pad="0" width="128">
151 Bubble Chat: 155 Bubble Chat:
152 </text> 156 </text>
153 <check_box bottom="-376" control_name="UseChatBubbles" enabled="true" follows="left|top" 157 <check_box bottom="-386" control_name="UseChatBubbles" enabled="true" follows="left|top"
154 font="SansSerifSmall" height="16" initial_value="false" 158 font="SansSerifSmall" height="16" initial_value="false"
155 label="Show chat bubbles" left="148" mouse_opaque="true" 159 label="Show chat bubbles" left="148" mouse_opaque="true"
156 name="bubble_text_chat" radio_style="false" width="237" /> 160 name="bubble_text_chat" radio_style="false" width="237" />
157 <slider bottom="-392" can_edit_text="false" control_name="ChatBubbleOpacity" 161 <slider bottom="-402" can_edit_text="false" control_name="ChatBubbleOpacity"
158 decimal_digits="3" enabled="true" follows="left|top" height="12" 162 decimal_digits="3" enabled="true" follows="left|top" height="12"
159 increment="0.05" initial_val="1" label="Opacity" left="148" max_val="1" 163 increment="0.05" initial_val="1" label="Opacity" left="148" max_val="1"
160 min_val="0" mouse_opaque="true" name="bubble_chat_opacity" show_text="true" 164 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 6c8ffdb..e8a2625 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
@@ -73,14 +73,6 @@
73 follows="left|top" height="16" increment="1" initial_val="300" 73 follows="left|top" height="16" increment="1" initial_val="300"
74 label="Away Timeout:" label_width="141" left="10" max_val="600" 74 label="Away Timeout:" label_width="141" left="10" max_val="600"
75 min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" /> 75 min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" />
76 <check_box bottom="-286" enabled="true" follows="left|top"
77 font="SansSerifSmall" height="16" initial_value="false"
78 label="Rotate Mini-Map" left="151" mouse_opaque="true"
79 name="rotate_mini_map_checkbox" radio_style="false" width="256" />
80 <check_box bottom="-286" control_name="MiniMapTeleport" enabled="true" follows="left|top"
81 font="SansSerifSmall" height="16" initial_value="false"
82 label="Doubleclick Mini-Map Teleports" left="280" mouse_opaque="true"
83 name="teleport_mini_map_checkbox" radio_style="false" width="256" />
84 <check_box bottom="-304" enabled="true" 76 <check_box bottom="-304" enabled="true"
85 follows="left|top" font="SansSerifSmall" height="16" initial_value="false" 77 follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
86 label="Notify when Linden dollars (L$) spent or received" left="151" 78 label="Notify when Linden dollars (L$) spent or received" left="151"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
index 527309e..d5d43b1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
@@ -8,6 +8,10 @@
8 height="16" initial_value="false" 8 height="16" initial_value="false"
9 label="Run Second Life in a window" left="10" mouse_opaque="true" 9 label="Run Second Life in a window" left="10" mouse_opaque="true"
10 name="windowed mode" radio_style="false" width="100" /> 10 name="windowed mode" radio_style="false" width="100" />
11 <check_box bottom_delta="0" enabled="true" follows="left|top"
12 font="SansSerifSmall" height="16" initial_value="false"
13 label="Show environment control in toolbar" left="248" mouse_opaque="true"
14 name="toggle_windlight_control" radio_style="false" width="237" />
11 <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom="-43" 15 <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom="-43"
12 embedded_items="false" enabled="false" follows="left|top" 16 embedded_items="false" enabled="false" follows="left|top"
13 font="SansSerifSmall" height="20" hide_border="true" 17 font="SansSerifSmall" height="20" hide_border="true"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
index f0f79e4..ee00455 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
@@ -2,92 +2,102 @@
2<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom" 2<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
3 height="408" label="Communication" left="102" mouse_opaque="true" name="im" 3 height="408" label="Communication" left="102" mouse_opaque="true" name="im"
4 width="517"> 4 width="517">
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="-20" drop_shadow_visible="true" enabled="true" follows="left|top" 6 bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
7 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12" 7 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
8 mouse_opaque="false" name="text_box" v_pad="0" width="128"> 8 mouse_opaque="false" name="text_box" v_pad="0" width="128">
9 My Online Status: 9 My Online Status:
10 </text> 10 </text>
11 <check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall" 11 <check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall"
12 height="16" initial_value="false" 12 height="16" initial_value="false"
13 label="Only my Friends and Groups can see when I am online" 13 label="Only my Friends and Groups can see when I am online"
14 left="148" mouse_opaque="true" name="online_visibility" radio_style="false" 14 left="148" mouse_opaque="true" name="online_visibility" radio_style="false"
15 width="350" /> 15 width="350" />
16 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 16 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
17 bottom="-40" drop_shadow_visible="true" enabled="true" follows="left|top" 17 bottom="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
18 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12" 18 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
19 mouse_opaque="false" name="text_box2" v_pad="0" width="128"> 19 mouse_opaque="false" name="text_box2" v_pad="0" width="128">
20 IM Options: 20 IM Options:
21 </text> 21 </text>
22 <string name="log_in_to_change"> 22 <string name="log_in_to_change">
23 log in to change 23 log in to change
24 </string> 24 </string>
25 <check_box bottom="-45" enabled="true" follows="left|top" font="SansSerifSmall" 25 <check_box bottom="-45" enabled="true" follows="left|top" font="SansSerifSmall"
26 height="16" initial_value="false" label="Send IM to Email ([EMAIL])" 26 height="16" initial_value="false" label="Send IM to Email ([EMAIL])"
27 left="148" mouse_opaque="true" name="send_im_to_email" radio_style="false" 27 left="148" mouse_opaque="true" name="send_im_to_email" radio_style="false"
28 width="350" /> 28 width="350" />
29 <check_box bottom="-65" enabled="true" follows="left|top" 29 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
30 bottom="-59" drop_shadow_visible="true" enabled="true" follows="left|top"
31 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
32 mouse_opaque="false" name="show_ims_label" v_pad="0" width="100">
33 Show IMs in:
34 </text>
35 <check_box bottom="-65" enabled="true" follows="left|top"
30 font="SansSerifSmall" height="16" initial_value="false" 36 font="SansSerifSmall" height="16" initial_value="false"
31 label="Show IMs with Chat" left="148" mouse_opaque="true" 37 label="Main Chat" left="248" mouse_opaque="true"
32 name="include_im_in_chat_history" radio_style="false" width="237" /> 38 name="include_im_in_chat_console" radio_style="false" width="100" />
33 <check_box bottom="-85" enabled="true" follows="left|top" 39 <check_box bottom="-65" enabled="true" follows="left|top"
40 font="SansSerifSmall" height="16" initial_value="false"
41 label="Local Chat" left="348" mouse_opaque="true"
42 name="include_im_in_chat_history" radio_style="false" width="100" />
43 <check_box bottom="-85" enabled="true" follows="left|top"
34 font="SansSerifSmall" height="16" initial_value="false" 44 font="SansSerifSmall" height="16" initial_value="false"
35 label="Show timestamps in IM" left="148" mouse_opaque="true" 45 label="Show timestamps in IM" left="148" mouse_opaque="true"
36 name="show_timestamps_check" radio_style="false" width="237" /> 46 name="show_timestamps_check" radio_style="false" width="237" />
37 <check_box bottom="-105" enabled="true" 47 <check_box bottom="-105" enabled="true"
38 follows="left|top" font="SansSerifSmall" height="16" 48 follows="left|top" font="SansSerifSmall" height="16"
39 initial_value="false" label="Show online Friend notifications" left="148" 49 initial_value="false" label="Show online Friend notifications" left="148"
40 mouse_opaque="true" name="friends_online_notify_checkbox" 50 mouse_opaque="true" name="friends_online_notify_checkbox"
41 radio_style="false" width="256" /> 51 radio_style="false" width="256" />
42 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 52 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
43 bottom="-125" drop_shadow_visible="true" enabled="true" follows="left|top" 53 bottom="-125" drop_shadow_visible="true" enabled="true" follows="left|top"
44 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12" 54 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
45 mouse_opaque="false" name="text_box3" v_pad="0" width="128"> 55 mouse_opaque="false" name="text_box3" v_pad="0" width="128">
46 Busy Mode Response: 56 Busy Mode Response:
47 </text> 57 </text>
48 <text_editor type="string" length="1" bottom="-185" embedded_items="false" enabled="true" follows="left|top" 58 <text_editor type="string" length="1" bottom="-185" embedded_items="false" enabled="true" follows="left|top"
49 font="SansSerifSmall" height="70" left="148" max_length="255" 59 font="SansSerifSmall" height="70" left="148" max_length="255"
50 mouse_opaque="true" name="busy_response" width="330" word_wrap="true" /> 60 mouse_opaque="true" name="busy_response" width="330" word_wrap="true" />
51 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 61 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
52 bottom="-218" drop_shadow_visible="true" enabled="true" follows="left|top" 62 bottom="-218" drop_shadow_visible="true" enabled="true" follows="left|top"
53 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12" 63 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
54 mouse_opaque="false" name="text_box4" v_pad="0" width="128"> 64 mouse_opaque="false" name="text_box4" v_pad="0" width="128">
55 Logging Options: 65 Logging Options:
56 </text> 66 </text>
57 <check_box bottom="-225" enabled="true" 67 <check_box bottom="-225" enabled="true"
58 follows="left|top" font="SansSerifSmall" height="16" 68 follows="left|top" font="SansSerifSmall" height="16"
59 initial_value="false" label="Save a log of IM on my computer" left="148" 69 initial_value="false" label="Save a log of IM on my computer" left="148"
60 mouse_opaque="true" name="log_instant_messages" radio_style="false" 70 mouse_opaque="true" name="log_instant_messages" radio_style="false"
61 width="237" /> 71 width="237" />
62 <check_box bottom="-245" enabled="true" 72 <check_box bottom="-245" enabled="true"
63 follows="left|top" font="SansSerifSmall" height="16" 73 follows="left|top" font="SansSerifSmall" height="16"
64 initial_value="false" label="Show timestamps in IM log" left="168" 74 initial_value="false" label="Show timestamps in IM log" left="168"
65 mouse_opaque="true" name="log_instant_messages_timestamp" radio_style="false" 75 mouse_opaque="true" name="log_instant_messages_timestamp" radio_style="false"
66 width="217" /> 76 width="217" />
67 <check_box bottom="-265" enabled="true" follows="left|top" 77 <check_box bottom="-265" enabled="true" follows="left|top"
68 font="SansSerifSmall" height="16" initial_value="false" 78 font="SansSerifSmall" height="16" initial_value="false"
69 label="Show the end of last IM conversation" left="168" mouse_opaque="true" 79 label="Show the end of last IM conversation" left="168" mouse_opaque="true"
70 name="log_show_history" radio_style="false" width="217" /> 80 name="log_show_history" radio_style="false" width="217" />
71 <check_box bottom="-285" enabled="true" follows="left|top" 81 <check_box bottom="-285" enabled="true" follows="left|top"
72 font="SansSerifSmall" height="16" initial_value="false" label="Save a log of Local Chat on my computer" 82 font="SansSerifSmall" height="16" initial_value="false" label="Save a log of Local Chat on my computer"
73 left="148" mouse_opaque="true" name="log_chat" radio_style="false" 83 left="148" mouse_opaque="true" name="log_chat" radio_style="false"
74 width="237" /> 84 width="237" />
75 <check_box bottom="-305" enabled="true" follows="left|top" 85 <check_box bottom="-305" enabled="true" follows="left|top"
76 font="SansSerifSmall" height="16" initial_value="false" 86 font="SansSerifSmall" height="16" initial_value="false"
77 label="Show timestamps in Local Chat log" left="168" mouse_opaque="true" 87 label="Show timestamps in Local Chat log" left="168" mouse_opaque="true"
78 name="log_chat_timestamp" radio_style="false" width="217" /> 88 name="log_chat_timestamp" radio_style="false" width="217" />
79 <check_box bottom="-325" enabled="true" follows="left|top" 89 <check_box bottom="-325" enabled="true" follows="left|top"
80 font="SansSerifSmall" height="16" initial_value="false" 90 font="SansSerifSmall" height="16" initial_value="false"
81 label="Show incoming IM in Local Chat log" left="168" mouse_opaque="true" 91 label="Show incoming IM in Local Chat log" left="168" mouse_opaque="true"
82 name="log_chat_IM" radio_style="false" width="217" /> 92 name="log_chat_IM" radio_style="false" width="217" />
83 <check_box bottom="-345" enabled="true" follows="left|top" 93 <check_box bottom="-345" enabled="true" follows="left|top"
84 font="SansSerifSmall" height="16" initial_value="false" 94 font="SansSerifSmall" height="16" initial_value="false"
85 label="Include date with timestamps" left="148" mouse_opaque="true" 95 label="Include date with timestamps" left="148" mouse_opaque="true"
86 name="log_date_timestamp" radio_style="false" width="237" /> 96 name="log_date_timestamp" radio_style="false" width="237" />
87 <button bottom="-367" follows="right|bottom" font="SansSerif" halign="center" 97 <button bottom="-367" follows="right|bottom" font="SansSerif" halign="center"
88 height="20" label="Change Path" label_selected="Change Path" left="170" 98 height="20" label="Change Path" label_selected="Change Path" left="170"
89 mouse_opaque="true" name="log_path_button" width="90" /> 99 mouse_opaque="true" name="log_path_button" width="90" />
90 <line_editor border_drop_shadow_visible="false" border_visible="false" bottom="-366" 100 <line_editor border_drop_shadow_visible="false" border_visible="false" bottom="-366"
91 drop_shadow_visible="true" enabled="false" follows="top|left|right" 101 drop_shadow_visible="true" enabled="false" follows="top|left|right"
92 font="SansSerifSmall" halign="right" height="19" left="248" 102 font="SansSerifSmall" halign="right" height="19" left="248"
93 max_length="254" mouse_opaque="false" name="log_path_string" right="-20" /> 103 max_length="254" mouse_opaque="false" name="log_path_string" right="-20" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
index 48da432..d4ec307 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
@@ -10,8 +10,8 @@
10 </text> 10 </text>
11 <slider bottom_delta="-25" can_edit_text="true" 11 <slider bottom_delta="-25" can_edit_text="true"
12 decimal_digits="0" enabled="true" follows="left|top" height="15" 12 decimal_digits="0" enabled="true" follows="left|top" height="15"
13 increment="10" initial_val="50" left_delta="0" max_val="1500" min_val="50" 13 increment="10" initial_val="1000" left_delta="0" max_val="5000" min_val="50"
14 mouse_opaque="true" name="max_bandwidth" show_text="true" value="500" 14 mouse_opaque="true" name="max_bandwidth" show_text="true" value="1000"
15 width="180" /> 15 width="180" />
16 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 16 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
17 bottom_delta="4" drop_shadow_visible="true" enabled="true" 17 bottom_delta="4" drop_shadow_visible="true" enabled="true"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_controls.xml b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_controls.xml
new file mode 100644
index 0000000..b9c6fc3
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_controls.xml
@@ -0,0 +1,14 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<panel bg_visible="false" border="false" border_visible="false" bottom="1"
3 enabled="true" follows="right|bottom" height="20" left="0"
4 name="windlight_controls" width="182">
5 <button bottom="-21" follows="left|bottom" font="SansSerif" halign="center" height="20"
6 label="Editor" left="4" name="Environment"
7 tool_tip="Click here to adjust world environment" width="80" />
8 <flyout_button bottom="-21" follows="left|bottom" height="20" label="Sky" left_delta="82" width="71"
9 list_position="above" mouse_opaque="true" name="Presets" tool_tip="Windlight presets">
10 </flyout_button>
11 <button bottom="-22" follows="left|bottom" font="SansSerif" halign="center" height="22" toggle="true"
12 label="" left_delta="72" name="Popup" scale_image="true" control_name="ShowWindlightSettingsPopup"
13 tool_tip="Click here to adjust draw distance" width="22" />
14</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml
new file mode 100644
index 0000000..ead9ad7
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml
@@ -0,0 +1,22 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<panel bg_visible="false" border="false" border_visible="false" bottom="0"
3 enabled="true" follows="right|bottom" height="20" left="0" mouse_opaque="true"
4 name="windlight_remote" use_bounding_rect="true" width="182">
5 <panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="22" left="0" width="182" />
6 <panel bottom="3" filename="panel_windlight_controls.xml" name="panel_windlight_controls" height="20" left="0" width="182" />
7 <string name="sunrise">
8 Sunrise
9 </string>
10 <string name="sunset">
11 Midday
12 </string>
13 <string name="noon">
14 Noon
15 </string>
16 <string name="midnight">
17 Midnight
18 </string>
19 <string name="revert_region">
20 Revert to Region Default
21 </string>
22</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
new file mode 100644
index 0000000..2fd9be5
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
@@ -0,0 +1,34 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<panel bg_visible="false" border="false" border_visible="false" bottom="0"
3 follows="right|bottom" height="47" left="0" mouse_opaque="true"
4 name="windlight_remote" use_bounding_rect="true" width="182">
5 <panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="47" left="0" width="182" />
6 <slider bottom="-20" can_edit_text="false" control_name="RenderFarClip"
7 decimal_digits="0" enabled="true" height="18"
8 increment="8" initial_val="160" label="Draw Distance:"
9 label_width="78" left="6" max_val="512" min_val="64" mouse_opaque="true"
10 name="DrawDistance" show_text="true" width="170" />
11 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
12 bottom="-14" drop_shadow_visible="true" enabled="true" follows="left|top"
13 font="SansSerifSmall" h_pad="0" halign="left" height="12"
14 left="170" mouse_opaque="true" name="DrawDistanceMeterText2" v_pad="0"
15 width="8">
16 m
17 </text>
18 <panel bottom="13" filename="panel_windlight_controls.xml" left="0" width="182" />
19 <string name="sunrise">
20 Sunrise
21 </string>
22 <string name="sunset">
23 Midday
24 </string>
25 <string name="noon">
26 Noon
27 </string>
28 <string name="midnight">
29 Midnight
30 </string>
31 <string name="revert_region">
32 Revert to Region Default
33 </string>
34</panel>
diff --git a/linden/indra/newview/skins/silver/colors_base.xml b/linden/indra/newview/skins/silver/colors_base.xml
index 9ec721c..abe61bf 100644
--- a/linden/indra/newview/skins/silver/colors_base.xml
+++ b/linden/indra/newview/skins/silver/colors_base.xml
@@ -69,6 +69,8 @@
69<TextEmbeddedItemColor value="0, 0, 128, 255" /> <!-- Text of items embedded in notecards --> 69<TextEmbeddedItemColor value="0, 0, 128, 255" /> <!-- Text of items embedded in notecards -->
70<TextDefaultColor value="0, 20, 0, 255"/> <!-- Non-keyword text in the script editor --> 70<TextDefaultColor value="0, 20, 0, 255"/> <!-- Non-keyword text in the script editor -->
71<ScriptBgReadOnlyColor value="180, 180, 180, 255" /> <!-- Not used --> 71<ScriptBgReadOnlyColor value="180, 180, 180, 255" /> <!-- Not used -->
72<TextLinkColor value="0, 20, 255, 255"/>
73<TextLinkHoverColor value="0, 50, 255, 255"/>
72 74
73<!-- LISTBOXES --> 75<!-- LISTBOXES -->
74<ScrollBgReadOnlyColor value="255, 255, 255, 140" /> <!-- Background of read only lists --> 76<ScrollBgReadOnlyColor value="255, 255, 255, 140" /> <!-- Background of read only lists -->
@@ -159,6 +161,7 @@
159<!-- MAP --> 161<!-- MAP -->
160<MapAvatar value="0, 255, 0, 255" /> <!-- Your avatar's glyph color --> 162<MapAvatar value="0, 255, 0, 255" /> <!-- Your avatar's glyph color -->
161<MapFriend value="255, 255, 0, 255" /> <!-- Your friends' glyph color --> 163<MapFriend value="255, 255, 0, 255" /> <!-- Your friends' glyph color -->
164<MapMuted value="128, 128, 128, 255" /> <!-- Muted avatars' glyph color -->
162 165
163<!-- MINI-MAP --> 166<!-- MINI-MAP -->
164<NetMapBackgroundColor value="0, 0, 0, 77" /> <!-- Mini-map floater background --> 167<NetMapBackgroundColor value="0, 0, 0, 77" /> <!-- Mini-map floater background -->
diff --git a/linden/indra/newview/skins/silver/textures/arrow_left.tga b/linden/indra/newview/skins/silver/textures/arrow_left.tga
new file mode 100644
index 0000000..43fbf12
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/arrow_left.tga
Binary files differ
diff --git a/linden/indra/newview/skins/silver/textures/arrow_right.tga b/linden/indra/newview/skins/silver/textures/arrow_right.tga
new file mode 100644
index 0000000..a92ac9c
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/arrow_right.tga
Binary files differ
diff --git a/linden/indra/newview/skins/silver/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/silver/xui/en-us/panel_avatar.xml
deleted file mode 100644
index 62738dc..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/panel_avatar.xml
+++ /dev/null
@@ -1,430 +0,0 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<panel bottom="-550" height="486" left="350" name="Panel Avatar" width="430">
3 <tab_container bottom="-486" height="486" left="0" mouse_opaque="false" name="tab"
4 tab_min_width="50" tab_position="top" width="419">
5 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
6 label="2nd Life" left="1" mouse_opaque="true" name="2nd Life" width="418">
7 <string name="CaptionTextAcctInfo">
8 [ACCTTYPE]
9[PAYMENTINFO]
10[AGEVERIFICATION]
11 </string>
12 <string name="AcctTypeResident">
13 Resident
14 </string>
15 <string name="AcctTypeTrial">
16 Trial
17 </string>
18 <string name="AcctTypeCharterMember">
19 Charter Member
20 </string>
21 <string name="AcctTypeEmployee">
22 Linden Lab Employee
23 </string>
24 <string name="PaymentInfoUsed">
25 Payment Info Used
26 </string>
27 <string name="PaymentInfoOnFile">
28 Payment Info On File
29 </string>
30 <string name="NoPaymentInfoOnFile">
31 No Payment Info On File
32 </string>
33 <string name="AgeVerified">
34 Age-verified
35 </string>
36 <string name="NotAgeVerified">
37 Not Age-verified
38 </string>
39 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
40 bottom="-24" drop_shadow_visible="true" follows="left|top"
41 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
42 mouse_opaque="true" name="Name:" v_pad="0" width="70">
43 Name:
44 </text>
45 <name_editor bevel_style="in" border_style="line"
46 border_thickness="1" bottom="-24" enabled="false" follows="left|top"
47 font="SansSerifSmall" height="16" is_unicode="false" left_delta="75"
48 max_length="254" mouse_opaque="false" name="name"
49 width="180" />
50 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
51 bottom="-24" drop_shadow_visible="true" follows="left|top"
52 font="SansSerifsmall" h_pad="0" halign="left" height="16" left="279"
53 mouse_opaque="true" name="online_yes" v_pad="0" width="121">
54 Currently Online
55 </text>
56 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
57 bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
58 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279"
59 mouse_opaque="true" name="label" v_pad="0" width="121">
60 Born:
61 </text>
62 <line_editor bevel_style="in" border_style="line"
63 border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"
64 font="SansSerifSmall" height="16" is_unicode="false" left="279"
65 max_length="254" mouse_opaque="false" name="born"
66 width="121" />
67 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
68 bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
69 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279"
70 mouse_opaque="true" name="label2" v_pad="0" width="121">
71 Account:
72 </text>
73 <view_border bevel_style="in" bottom_delta="-48" follows="left|top" height="48" left="279"
74 mouse_opaque="false" name="acct_border" width="121" />
75 <text bg_visible="false" border_drop_shadow_visible="false"
76 border_visible="true" bottom_delta="0" drop_shadow_visible="true"
77 follows="left|top" font="SansSerifSmall" height="48" left="279"
78 mouse_opaque="false" name="acct" width="121" />
79 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
80 bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
81 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279"
82 mouse_opaque="true" name="partner_label"
83 tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
84 v_pad="0" width="130">
85 Partner:
86 </text>
87 <button bottom_delta="2" follows="left|top" font="SansSerif" halign="center"
88 height="16" label="i" label_selected="i" left_delta="44"
89 mouse_opaque="true" name="partner_info"
90 tool_tip="Click to open partner&apos;s profile" width="18" />
91 <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
92 height="16" label="?" label_selected="?" left_delta="24"
93 mouse_opaque="true" name="partner_help" width="18" />
94 <line_editor bevel_style="in" border_style="line"
95 border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"
96 font="SansSerifSmall" height="16" is_unicode="false" left="279"
97 max_length="254" mouse_opaque="false" name="partner_edit"
98 tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
99 width="121">
100 [FIRST] [LAST]
101 </line_editor>
102 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
103 bottom="-44" drop_shadow_visible="true" follows="left|top"
104 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
105 mouse_opaque="true" name="Photo:" v_pad="0" width="70">
106 Photo:
107 </text>
108 <texture_picker allow_no_texture="true" bottom="-179" can_apply_immediately="false"
109 default_image_name="None" follows="left|top" height="151" label=""
110 left="79" mouse_opaque="true" name="img"
111 tool_tip="Click to choose a picture" width="180" />
112 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
113 bottom="-183" drop_shadow_visible="true" follows="left|top"
114 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
115 mouse_opaque="true" name="Groups:" v_pad="0" width="70">
116 Groups:
117 </text>
118 <scroll_list background_visible="true" bottom="-258" column_padding="5" draw_border="true"
119 follows="left|top" height="90" left="79" mouse_opaque="false"
120 multi_select="false" name="groups" width="321" />
121 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
122 bottom="-280" drop_shadow_visible="true" follows="left|top"
123 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
124 mouse_opaque="true" name="About:" v_pad="0" width="70">
125 About:
126 </text>
127 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
128 bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
129 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="0"
130 mouse_opaque="true" name="(500 chars)" v_pad="0" width="70">
131 (500 chars)
132 </text>
133 <text_editor bottom="-375" embedded_items="false"
134 enabled="true" follows="left|top" font="SansSerifSmall" height="110"
135 is_unicode="false" left="79" max_length="511" mouse_opaque="true"
136 name="about" width="321" word_wrap="true" />
137 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
138 bottom="-403" drop_shadow_visible="true" follows="left|top"
139 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="0"
140 mouse_opaque="true" name="Give item:" v_pad="0" width="75">
141 Give item:
142 </text>
143 <view_border blevel_style="in" border_thickness="0" bottom="-466" follows="left|top"
144 height="466" left_delta="4" mouse_opaque="false" name="drop_target_rect"
145 width="409" />
146 <view_border blevel_style="in" bottom="-403" follows="left|top" height="16" left_delta="75"
147 mouse_opaque="false" name="drop_target_rect_vis" width="321" />
148 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
149 bottom_delta="0" drop_shadow_visible="true" follows="left|top"
150 font="SansSerifSmall" h_pad="0" halign="center" height="16" left_delta="0"
151 mouse_opaque="true" name="Give inventory"
152 tool_tip="Drop inventory items here to give them to this person." v_pad="2"
153 width="321">
154 Drop inventory item here.
155 </text>
156 <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
157 initial_value="false" label="Show in search" left="75" mouse_opaque="true"
158 name="allow_publish"
159 tool_tip="Publish extra profile information such as description and image in Search."
160 width="130" />
161 <button bottom="-423" follows="left|top" font="SansSerif" halign="center" height="16"
162 label="?" label_selected="?" left_delta="145" mouse_opaque="true" name="?"
163 width="20" />
164 <button bottom="-428" font="SansSerif" halign="center" height="20" label="Find on Map"
165 label_selected="Find on Map" left="24" mouse_opaque="true"
166 name="Find on Map" width="100" />
167 <button bottom="-428" font="SansSerif" halign="center" height="20"
168 label="Offer Teleport..." label_selected="Offer Teleport..."
169 left_delta="102" mouse_opaque="true" name="Offer Teleport..." width="140" />
170 <button bottom="-428" font="SansSerif" halign="center" height="20"
171 label="Add Friend..." label_selected="Add Friend..." left_delta="142"
172 mouse_opaque="true" name="Add Friend..." width="130" />
173 <button bottom_delta="-24" font="SansSerif" halign="center" height="20" label="Pay..."
174 label_selected="Pay..." left="24" mouse_opaque="true" name="Pay..."
175 width="100" />
176 <button bottom_delta="0" font="SansSerif" halign="center" height="20"
177 label="Instant Message..." label_selected="Instant Message..."
178 left_delta="102" mouse_opaque="true" name="Instant Message..."
179 tool_tip="Instant Message (IM)" width="140" />
180 <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Mute"
181 label_selected="Mute" left_delta="142" mouse_opaque="true" name="Mute"
182 width="130" />
183 </panel>
184 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
185 label="Web" left="1" mouse_opaque="true" name="WebProfile" width="418">
186 <line_editor bevel_style="in" border_style="line"
187 border_thickness="1" bottom_delta="-18" enabled="false" follows="left|top"
188 font="SansSerifSmall" height="16" is_unicode="false" left="10"
189 max_length="254" mouse_opaque="true" name="url_edit"
190 width="400" />
191 <flyout_button bottom_delta="-22" follows="left|top" font="SansSerifSmall" halign="center"
192 height="18" label="Load" label_selected="Load" left="10"
193 mouse_opaque="true" name="load" enabled="false"
194 tool_tip="Load this profile page with embedded web browser." width="80" >
195 <flyout_button_item value="open" name="open_item">In external browser</flyout_button_item>
196 <flyout_button_item value="home" name="home_item">Home URL</flyout_button_item>
197 </flyout_button>
198 <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
199 height="18" label="?" label_selected="?" left_delta="85"
200 mouse_opaque="true" name="web_profile_help" width="18" />
201 <check_box bottom_delta="0" follows="right|top" font="SansSerifSmall" height="16"
202 initial_value="false" label="Automatically load web profiles"
203 left_delta="30" mouse_opaque="true" name="auto_load"
204 tool_tip="Automatically load ALL profile webpages without asking first."
205 width="127" />
206 <web_browser border_visible="false" bottom="-444" follows="top|left|right" height="400"
207 ignore_ui_scale="false" left="10" name="profile_html" start_url=""
208 width="400" />
209 <text bottom="5" follows="bottom|left|right" left="15" name="status_text" right="-70"
210 top="25" />
211 </panel>
212 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
213 label="Interests" left="1" mouse_opaque="true" name="Interests" width="418">
214 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
215 bottom="-36" drop_shadow_visible="true" follows="left|top"
216 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
217 mouse_opaque="true" name="I Want To:" v_pad="0" width="70">
218 I Want To:
219 </text>
220 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
221 initial_value="false" label="Build" left_delta="70" mouse_opaque="true"
222 name="chk0" width="90" />
223 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
224 initial_value="false" label="Explore" left_delta="170" mouse_opaque="true"
225 name="chk1" width="90" />
226 <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
227 initial_value="false" label="Meet" left_delta="-170" mouse_opaque="true"
228 name="chk2" width="57" />
229 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
230 initial_value="false" label="Be Hired" left_delta="170" mouse_opaque="true"
231 name="chk6" width="92" />
232 <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
233 initial_value="false" label="Group" left_delta="-170" mouse_opaque="true"
234 name="chk3" width="90" />
235 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
236 initial_value="false" label="Buy" left_delta="170" mouse_opaque="true"
237 name="chk4" width="90" />
238 <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
239 initial_value="false" label="Sell" left_delta="-170" mouse_opaque="true"
240 name="chk5" width="50" />
241 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
242 initial_value="false" label="Hire" left_delta="170" mouse_opaque="true"
243 name="chk7" width="92" />
244 <line_editor bevel_style="in" border_style="line"
245 border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
246 font="SansSerifSmall" height="16" is_unicode="false" left="74"
247 max_length="254" mouse_opaque="true" name="want_to_edit"
248 width="330" />
249 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
250 bottom_delta="-26" drop_shadow_visible="true" follows="left|top"
251 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
252 mouse_opaque="true" name="Skills:" v_pad="0" width="70">
253 Skills:
254 </text>
255 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
256 initial_value="false" label="Textures" left_delta="70" mouse_opaque="true"
257 name="schk0" width="90" />
258 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
259 initial_value="false" label="Architecture" left_delta="170"
260 mouse_opaque="true" name="schk1" width="93" />
261 <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
262 initial_value="false" label="Event Planning" left_delta="0"
263 mouse_opaque="true" name="schk2" width="105" />
264 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
265 initial_value="false" label="Modeling" left_delta="-170"
266 mouse_opaque="true" name="schk3" width="90" />
267 <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
268 initial_value="false" label="Scripting" left_delta="0" mouse_opaque="true"
269 name="schk4" width="90" />
270 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
271 initial_value="false" label="Custom Characters" left_delta="170"
272 mouse_opaque="true" name="schk5" width="127" />
273 <line_editor bevel_style="in" border_style="line"
274 border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
275 font="SansSerifSmall" height="16" is_unicode="false" left="74"
276 max_length="254" mouse_opaque="true" name="skills_edit"
277 width="330" />
278 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
279 bottom_delta="-30" drop_shadow_visible="true" follows="left|top"
280 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
281 mouse_opaque="true" name="Languages:" v_pad="0" width="70">
282 Languages:
283 </text>
284 <line_editor bevel_style="in" border_style="line"
285 border_thickness="1" bottom_delta="0" enabled="true" follows="left|top"
286 font="SansSerifSmall" height="16" is_unicode="false" left="74"
287 max_length="254" mouse_opaque="true" name="languages_edit"
288 width="330" />
289 </panel>
290 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
291 label="Picks" left="1" mouse_opaque="true" name="Picks" width="418">
292 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
293 bottom="-20" drop_shadow_visible="true" follows="left|top"
294 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="114"
295 mouse_opaque="true"
296 name="Tell everyone about your favorite places in Second Life." v_pad="0"
297 width="302">
298 Tell everyone about your favorite places in Second Life.
299 </text>
300 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
301 height="20" label="New..." label_selected="New..." left="114"
302 mouse_opaque="true" name="New..." width="75" />
303 <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"
304 label="Delete..." label_selected="Delete..." left_delta="79"
305 mouse_opaque="true" name="Delete..." width="75" />
306 <tab_container bottom="-411" follows="left|top" height="363" left="4" mouse_opaque="false"
307 name="picks tab" tab_position="left" width="412" />
308 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
309 bottom="-70" drop_shadow_visible="true" follows="left|top" font="SansSerif"
310 h_pad="0" halign="left" height="20" left="114" mouse_opaque="false"
311 name="loading_text" v_pad="0" width="302">
312 Loading...
313 </text>
314 </panel>
315 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
316 label="Classified" left="1" mouse_opaque="true" name="Classified"
317 width="418">
318 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
319 bottom="-20" drop_shadow_visible="true" follows="left|top"
320 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="114"
321 mouse_opaque="true"
322 name="Place an ad in Second Life&apos;s classified listings." v_pad="0"
323 width="302">
324 Place an ad in Second Life&apos;s classified listings.
325 </text>
326 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
327 height="20" label="New..." label_selected="New..." left="114"
328 mouse_opaque="true" name="New..." width="75" />
329 <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"
330 label="Delete..." label_selected="Delete..." left_delta="79"
331 mouse_opaque="true" name="Delete..." width="75" />
332 <tab_container bottom="-443" follows="left|top" height="395" left="4" mouse_opaque="false"
333 name="classified tab" tab_position="left" width="412" />
334 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
335 bottom="-70" drop_shadow_visible="true" follows="left|top" font="SansSerif"
336 h_pad="0" halign="left" height="20" left="114" mouse_opaque="false"
337 name="loading_text" v_pad="0" width="302">
338 Loading...
339 </text>
340 </panel>
341 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
342 label="1st Life" left="1" mouse_opaque="true" name="1st Life" width="418">
343 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
344 bottom="-36" drop_shadow_visible="true" follows="left|top"
345 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
346 mouse_opaque="true" name="Photo:" v_pad="0" width="61">
347 Photo:
348 </text>
349 <texture_picker allow_no_texture="true" bottom="-171" can_apply_immediately="false"
350 default_image_name="None" follows="left|top" height="151" label=""
351 left="70" mouse_opaque="true" name="img"
352 tool_tip="Click to choose a picture" width="135" />
353 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
354 bottom="-203" drop_shadow_visible="true" follows="left|top"
355 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
356 mouse_opaque="true" name="Info:" v_pad="0" width="61">
357 Info:
358 </text>
359 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
360 bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
361 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="0"
362 mouse_opaque="true" name="(250 chars)" v_pad="0" width="65">
363 (250 chars)
364 </text>
365 <text_editor bottom="-347" embedded_items="false"
366 enabled="true" follows="left|top" font="SansSerifSmall" height="160"
367 is_unicode="false" left="70" max_length="254" mouse_opaque="false"
368 name="about" width="330" word_wrap="true" />
369 </panel>
370 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
371 label="My Notes" left="1" mouse_opaque="true" name="My Notes" width="418">
372 <string name="Loading">
373 Loading...
374 </string>
375 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
376 bottom="-52" drop_shadow_visible="true" follows="left|top"
377 font="SansSerifSmall" h_pad="0" halign="left" height="48" left="10"
378 mouse_opaque="true" name="label" v_pad="0" width="412">
379 Use this space to record your notes about this person. Keep track
380of trades in progress, joint projects, etc. Only you can see these
381notes. This person cannot see them, nor can other people.
382 </text>
383 <text_editor bottom_delta="-260" embedded_items="false" enabled="true" follows="left|top"
384 font="SansSerif" height="256" is_unicode="false" left="10"
385 max_length="1023" mouse_opaque="true" name="notes edit" width="400"
386 word_wrap="false" />
387 </panel>
388 </tab_container>
389 <button bottom="-483" font="SansSerif" halign="center" height="20" label="OK"
390 label_selected="OK" left="208" mouse_opaque="true" name="OK" width="100" />
391 <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Cancel"
392 label_selected="Cancel" left_delta="105" mouse_opaque="true" name="Cancel"
393 width="100" />
394 <button bottom_delta="132" font="SansSerif" halign="center" height="20" label="Kick"
395 label_selected="Kick" left="4" mouse_opaque="true" name="Kick" width="72" />
396 <button bottom_delta="-24" font="SansSerif" halign="center" height="20" label="Freeze"
397 label_selected="Freeze" left="4" mouse_opaque="true" name="Freeze"
398 tool_tip="Stop this resident&apos;s movement and chat." width="72" />
399 <button bottom_delta="-24" font="SansSerif" halign="center" height="20"
400 label="Unfreeze" label_selected="Unfreeze" left="4" mouse_opaque="true"
401 name="Unfreeze" tool_tip="Thaw resident" width="72" />
402 <button bottom_delta="-24" font="SansSerif" halign="center" height="20" label="CSR"
403 label_selected="CSR" left="4" mouse_opaque="true" name="csr_btn"
404 tool_tip="Open customer service tool for this resident" width="72" />
405 <string name="ShowOnMapNonFriend">
406 Show location on the map.
407Disabled because you have not
408formed a friendship with them.
409 </string>
410 <string name="ShowOnMapFriendOffline">
411 Show location on the map.
412 Disabled because they are not online.
413 </string>
414 <string name="ShowOnMapFriendOnline">
415 Show location on the map.
416 </string>
417 <string name="TeleportGod">
418 Force a teleport to your location.
419 </string>
420 <string name="TeleportPrelude">
421 Offer a teleport to your location.
422Disabled until you leave Orientation Island.
423 </string>
424 <string name="TeleportNormal">
425 Offer a teleport to your location.
426 </string>
427 <string name="Loading">
428 Loading...
429 </string>
430</panel>
generated by cgit v1.1 at 2024-11-15 18:36:33 +0000