From 8465910c79b8e746e04fd581cca2d60399e569b9 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:45:07 -0500
Subject: Second Life viewer sources 1.18.3.2-RC

---
 linden/indra/newview/skins/textures/textures.xml   |  1 +
 linden/indra/newview/skins/xui/en-us/alerts.xml    |  5 ++++
 .../skins/xui/en-us/floater_image_preview.xml      |  6 ++++-
 .../newview/skins/xui/en-us/floater_inventory.xml  |  2 +-
 .../xui/en-us/floater_sim_release_message.xml      | 17 ++++++++++++
 .../newview/skins/xui/en-us/floater_tools.xml      | 29 ++++++++++++++++++--
 .../newview/skins/xui/en-us/menu_pie_avatar.xml    |  5 +++-
 .../indra/newview/skins/xui/en-us/menu_viewer.xml  | 10 +++----
 linden/indra/newview/skins/xui/en-us/notify.xml    | 16 +++++++++--
 .../newview/skins/xui/en-us/panel_group_invite.xml | 31 ++++++++++++++--------
 10 files changed, 99 insertions(+), 23 deletions(-)
 create mode 100644 linden/indra/newview/skins/xui/en-us/floater_sim_release_message.xml

(limited to 'linden/indra/newview/skins')

diff --git a/linden/indra/newview/skins/textures/textures.xml b/linden/indra/newview/skins/textures/textures.xml
index 1c02ce4..ccf0834 100644
--- a/linden/indra/newview/skins/textures/textures.xml
+++ b/linden/indra/newview/skins/textures/textures.xml
@@ -394,6 +394,7 @@
 	<oi_hud_mov_3_0.tga value="f5ff1f08-4c92-8606-1854-cc5b9d3e445c"/>
 	<oi_hud_mov_1_2.tga value="1e3abeed-e893-c44e-1f9d-5ecc76d21e5d"/>
 	<oi_hud_mov_1_0.tga value="e300fc95-aa94-8e31-c501-ce903cac8b7c"/>
+	<eng_lng_1_0.jpg value="5fcaac05-0677-b208-e715-983ebf01d16f"/>
 	<circle.tga	value="0498c309-5306-43cd-82a2-ae31d096cdef"/>
 	<mute_icon.tga value="37c8e000-6aa2-41ef-8f86-e0c2e60bfa42"/>
 	<active_speakers.tga value="c97bdfb5-b0da-4741-877c-7c1553957d30"/>
diff --git a/linden/indra/newview/skins/xui/en-us/alerts.xml b/linden/indra/newview/skins/xui/en-us/alerts.xml
index d294ae8..3030b78 100644
--- a/linden/indra/newview/skins/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/xui/en-us/alerts.xml
@@ -3429,6 +3429,11 @@ spaceserver hiccup.
 			OK
 		</option>
 	</alert>
+	<alert modal="true" name="ProblemAddingEstateManager">
+		<message name="message">
+			Problems adding a new estate manager.  One or more estates may have a full manager list.
+		</message>
+	</alert>
 	<alert modal="true" name="UnableToLoadNotecard">
 		<message name="message">
 			Unable to load notecard&apos;s asset at this time.
diff --git a/linden/indra/newview/skins/xui/en-us/floater_image_preview.xml b/linden/indra/newview/skins/xui/en-us/floater_image_preview.xml
index 2cea9e7..c54b5de 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_image_preview.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_image_preview.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" height="440" min_height="140" min_width="300"
+     can_resize="false" height="463" min_height="140" min_width="300"
      name="Image Preview" title="" width="300">
 	<text bottom_delta="-40" follows="top|left" height="15" left="10" name="name_label">
 		Name:
@@ -53,6 +53,10 @@ Unable to read image.
 
 Try saving image as 24 bit Targa (.tga).
 	</text>
+    <check_box bottom="37" follows="bottom|left" enabled="false"
+         font="SansSerifSmall" height="16" initial_value="false"
+         label="Use lossless compression" left="10"
+         left_delta="2" name="lossless_check" control_name="LosslessJ2CUpload" width="280" />
 	<button bottom="10" follows="bottom|right" height="20" label="Cancel" left="182"
 	     name="cancel_btn" width="64" />
 	<button bottom="10" follows="bottom|left" height="20" label="Upload (L$[AMOUNT])"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_inventory.xml b/linden/indra/newview/skins/xui/en-us/floater_inventory.xml
index ffed294..3b1cb87 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_inventory.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_inventory.xml
@@ -1,4 +1,4 @@
-<floater bottom="-720" can_close="true" can_drag_on_left="false" can_minimize="false"
+<floater bottom="-720" can_close="true" can_drag_on_left="false" can_minimize="true"
      can_resize="true" height="563" hidden="false" left="882" min_height="150"
      min_width="240" mouse_opaque="true" name="Inventory"
      rect_control="FloaterInventoryRect" title="Inventory" width="467">
diff --git a/linden/indra/newview/skins/xui/en-us/floater_sim_release_message.xml b/linden/indra/newview/skins/xui/en-us/floater_sim_release_message.xml
new file mode 100644
index 0000000..5daa44b
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_sim_release_message.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
+     height="500" min_height="300" min_width="300" name="floaterreleasemessage"
+     title="Entering Region" width="700">
+	<button bottom="10" follows="bottom|right" font="SansSerifSmall" height="20"
+	     label="Close" name="close_btn" right="-10" width="50" />
+	<web_browser bottom="40" follows="top|left|bottom|right" font="SansSerifSmall" left="15"
+	     name="release_message_floater_browser" right="-15" top="-30" /> 
+	<text hidden="true" name="in-world_help_title">In-World Help</text>
+	<text hidden="true" name="in-world_help_url">
+		http://www.secondlife.com/app/support/inworld.html
+	</text>
+	<text hidden="true" name="additional_help_title">Additional Help</text>
+	<text hidden="true" name="additional_help_url">
+		http://www.secondlife.com/app/support/support.html
+	</text>
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/xui/en-us/floater_tools.xml
index 305a5ef..edd84cc 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_tools.xml
@@ -855,10 +855,35 @@
 			<spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
 			     hidden="false" increment="0.1" initial_val="1" left_delta="73" max_val="4"
 			     min_val="1" mouse_opaque="true" name="Revolutions" width="68" />
-           <texture_picker allow_no_texture="false" bottom="-211" can_apply_immediately="true"
+            <texture_picker allow_no_texture="false" bottom="-211" can_apply_immediately="true"
                  default_image_name="Default" follows="left|top" height="141" hidden="false"
                  label="Sculpt Texture" left="121" mouse_opaque="true" name="sculpt texture control"
-                 tool_tip="Click to choose a picture" width="141" />
+                 tool_tip="Click to choose a picture" width="141" visible="false"/>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" align="left" height="10" hidden="false"
+			     left="121" mouse_opaque="true" name="label sculpt type" v_pad="0" width="121" visible="false">
+				 Stitching type
+			</text>
+            <combo_box allow_text_entry="false" bottom_delta="-24" follows="left|top" height="18"
+                 hidden="false" left="121" max_chars="20" mouse_opaque="true"
+                 name="sculpt type control" width="141" visible="false">
+                <combo_item name="None" value="None" hidden="false">
+                    (none)
+                </combo_item>
+                <combo_item name="Sphere" value="Sphere">
+                    Sphere
+                </combo_item>
+                <combo_item name="Torus" value="Torus">
+                    Torus
+                </combo_item>
+                <combo_item name="Plane" value="Plane">
+                    Plane
+                </combo_item>
+                <combo_item name="Cylinder" value="Cylinder">
+                    Cylinder
+                </combo_item>
+			</combo_box>
 		</panel>
 		<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
 		     hidden="false" label="Features" left="1" mouse_opaque="false"
diff --git a/linden/indra/newview/skins/xui/en-us/menu_pie_avatar.xml b/linden/indra/newview/skins/xui/en-us/menu_pie_avatar.xml
index 91e27b7..b2280e2 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_pie_avatar.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_pie_avatar.xml
@@ -28,11 +28,14 @@
 			<on_click function="Avatar.Freeze" />
 			<on_enable function="Avatar.EnableFreezeEject" />
 		</menu_item_call>
-		<menu_item_separator />
 		<menu_item_call enabled="false" hidden="false" label="Give Card" mouse_opaque="true"
 		     name="Give Card">
 			<on_click function="Avatar.GiveCard" />
 		</menu_item_call>
+		<menu_item_call enabled="true" hidden="false" label="Group Invite..." mouse_opaque="true"
+			name="Invite...">
+			<on_click function="Avatar.InviteToGroup" />
+		</menu_item_call>
 		<menu_item_separator />
 		<menu_item_call enabled="false" hidden="false" label="Eject..." mouse_opaque="true"
 		     name="Eject...">
diff --git a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
index 4d30c05..d1bcb05 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
@@ -820,19 +820,19 @@
 		     label="Bug Reporting 101..." left="0" mouse_opaque="true"
 		     name="Bug Reporing 101..." width="166">
 			<on_click function="PromptShowURL"
-			     userdata="WebLaunchBugReport101,https://wiki.secondlife.com/wiki/Bug_Reporting_101" />
+			     userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101" />
 			</menu_item_call>
 			<menu_item_call bottom="-94" enabled="true" height="19" hidden="false"
 		     label="Security Issues..." left="0" mouse_opaque="true"
 		     name="Security Issues..." width="166">
 			<on_click function="PromptShowURL"
-			     userdata="WebLaunchSecurityIssues,https://wiki.secondlife.com/wiki/Security_issues" />
+			     userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues" />
 			</menu_item_call>
 			<menu_item_call bottom="-94" enabled="true" height="19" hidden="false"
 		     label="QA Wiki..." left="0" mouse_opaque="true"
 		     name="QA Wiki..." width="166">
 			<on_click function="PromptShowURL"
-			     userdata="WebLaunchQAWiki,https://wiki.secondlife.com/wiki/QA_Portal" />
+			     userdata="WebLaunchQAWiki,http://wiki.secondlife.com/wiki/QA_Portal" />
 			</menu_item_call>
 			<menu_item_separator bottom="-411" enabled="true" height="8" hidden="false" label="-----------"
 			left="0" mouse_opaque="true" name="separator7" width="250" />
@@ -840,13 +840,13 @@
 		     label="Public Issue Tracker..." left="0" mouse_opaque="true"
 		     name="Public Issue Tracker..." width="166">
 			<on_click function="PromptShowURL"
-			     userdata="WebLaunchPublicIssue,https://jira.secondlife.com" />
+			     userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
 			</menu_item_call>
 			<menu_item_call bottom="-94" enabled="true" height="19" hidden="false"
 		     label="Public Issue Tracker Help..." left="0" mouse_opaque="true"
 		     name="Publc Issue Tracker Help..." width="166">
 			<on_click function="PromptShowURL"
-			     userdata="WebLaunchPublicIssueHelp,https://wiki.secondlife.com/wiki/Issue_tracker" />
+			     userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" />
 			</menu_item_call>
 		</menu>
 	</menu>
diff --git a/linden/indra/newview/skins/xui/en-us/notify.xml b/linden/indra/newview/skins/xui/en-us/notify.xml
index b21325e..f4de3f1 100644
--- a/linden/indra/newview/skins/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/xui/en-us/notify.xml
@@ -233,13 +233,13 @@ Please select a single object.
 	</notify>
 	<notify name="TeleportToLandmark" tip="true">
 		<message name="message">
-			Now that you have reached the mainland, you can teleport to the location &apos;[NAME]&apos; by clicking on the Inventory button on the bottom right of your screen, and then select the Landmarks folder.
+			Now that you have reached the mainland, you can teleport to locations like &apos;[NAME]&apos; by clicking on the Inventory button on the bottom right of your screen, and then select the Landmarks folder.
 Double click on the landmark and click on Teleport to travel there.
 		</message>
 	</notify>
 	<notify name="TeleportToPerson" tip="true">
 		<message name="message">
-			Now that you have reached the mainland, you can contact the resident &apos;[NAME]&apos; by clicking on the Inventory button on the bottom right of your screen, and then select the Calling Cards folder.
+			Now that you have reached the mainland, you can contact residents like &apos;[NAME]&apos; by clicking on the Inventory button on the bottom right of your screen, and then select the Calling Cards folder.
 Double click on the card, click on Instant Message, and type a message.
 		</message>
 	</notify>
@@ -481,6 +481,9 @@ No scripts will run except those belonging to the land owner.
 		<option name="Decline">
 			Decline
 		</option>
+		<option name="Info">
+			Info
+		</option>
 	</notify>
 	<notify name="JoinGroupOfficerNoFee" tip="false">
 		<message name="message">
@@ -496,6 +499,9 @@ There is no cost to join this group.
 		<option name="Decline">
 			Decline
 		</option>
+		<option name="Info">
+			Info
+		</option>
 	</notify>
 	<notify name="JoinGroupMember" tip="false">
 		<message name="message">
@@ -511,6 +517,9 @@ To join this group, you will have to pay a signup fee of L$[COST]
 		<option name="Decline">
 			Decline
 		</option>
+		<option name="Info">
+			Info
+		</option>
 	</notify>
 	<notify name="JoinGroupMemberNoFee" tip="false">
 		<message name="message">
@@ -526,6 +535,9 @@ There is no cost to join this group.
 		<option name="Decline">
 			Decline
 		</option>
+		<option name="Info">
+			Info
+		</option>
 	</notify>
 	<notify name="OfferTeleport" tip="false">
 		<message name="message">
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_invite.xml b/linden/indra/newview/skins/xui/en-us/panel_group_invite.xml
index e369da9..3463880 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_invite.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_invite.xml
@@ -1,20 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="false" bottom="0" height="380" label="Invite a Member" left="0"
      name="invite_panel" select="false" width="210">
-	<text bottom_delta="-78" height="54" left="7" width="200">
+	<text bottom_delta="-44" follows="left|top" font="SansSerifSmall" height="20"
+		left="7" name="group_name_lbl" width="40">
+		Group:
+	</text>
+	<text bg_readonly_color="clear" bottom_delta="0" follows="left|top"
+			 font="SansSerifSmall" height="20" left="50" name="group_name_text"
+			 text_readonly_color="white" width="150">
+		(unknown)
+	</text>
+	<text bottom_delta="-50" height="54" left="7" width="200">
 		You can select multiple residents to 
-invite to your group. Click &apos;Open 
+invite to your group. Click &apos;Open
 Person Chooser&apos; to start.
 	</text>
-	<button bottom_delta="-10" font="SansSerifSmall" halign="center" height="20"
-	     label="Open Person Chooser" left="5" name="add_button" tool_tip=""
-	     width="200" />
-	<name_list allow_calling_card_drop="true" background_visible="true" bottom_delta="-193"
-	     column_padding="0" draw_border="true" fg_disable_color="grey"
-	     fg_selected_color="black" fg_unselected_color="black" height="189" left="5"
-	     multi_select="true" name="invitee_list"
-	     tool_tip="Hold the Ctrl key and click resident names  to multi-select."
-	     width="200" />
+	<button bottom_delta="-12" font="SansSerifSmall" halign="center" height="20"
+		 label="Open Person Chooser" left="5" name="add_button" tool_tip=""
+		 width="200" />
+	<name_list allow_calling_card_drop="true" background_visible="true" bottom_delta="-183"
+		 column_padding="0" draw_border="true" fg_disable_color="grey"
+		 fg_selected_color="black" fg_unselected_color="black" height="169" left="5"
+		 multi_select="true" name="invitee_list"
+		 tool_tip="Hold the Ctrl key and click resident names  to multi-select."
+		 width="200" />	
 	<button bottom_delta="-24" font="SansSerifSmall" halign="center" height="20"
 	     label="Remove Selected from List" left_delta="0" name="remove_button"
 	     tool_tip="Removes residents selected above from the invite list."
-- 
cgit v1.1