Second Life viewer sources 1.17.1.0

15 files changed, 244 insertions, 94 deletions

diff --git a/linden/indra/newview/skins/textures/textures.xml b/linden/indra/newview/skins/textures/textures.xml
index 89e4f53..79e910a 100644
--- a/linden/indra/newview/skins/textures/textures.xml
+++ b/linden/indra/newview/skins/textures/textures.xml
@@ -230,6 +230,7 @@
         <notify_tip_icon.tga value="74ba3584-58ea-9984-5b76-62d37942ab77"/>
         <notify_box_icon.tga value="b2ef2d31-9714-a07b-6ca7-31638166364b"/>
         <notify_next.tga value="07d0ea4c-af0c-aad1-dbbf-c24020ff2b80"/>
+        <notify_caution_icon.tga value="3a22ac15-39ac-409c-acec-b08b1b6b689b"/>
         <map_avatar_you_8.tga value="02fbdc40-5e07-a6e1-228b-58e10f8335b7"/>
         <map_avatar_8.tga value="0be58a91-8065-c02b-7a12-2cc14dddbc37"/>
         <map_avatar_16.tga value="db0dadd5-026a-88cf-f5c1-523a0a2daa3e"/>
diff --git a/linden/indra/newview/skins/xui/en-us/alerts.xml b/linden/indra/newview/skins/xui/en-us/alerts.xml
index d32b46a..6c11a06 100644
--- a/linden/indra/newview/skins/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/xui/en-us/alerts.xml
@@ -561,13 +561,12 @@ Objects: [N]
         </alert>
         <alert modal="true" name="ReturnAllTopObjects">
                 <message name="message">
-                        Are you sure you want to return all objects
-in this region back to their owner&apos;s inventory?
+                        Are you sure you want to return all listed objects back to their owner&apos;s inventory?
                 </message>
                 <option name="Return">
                         OK
                 </option>
-                <option name="Cancel">
+                <option default = "true" name="Cancel">
                         Cancel
                 </option>
         </alert>
@@ -620,6 +619,17 @@ to set its Landing Point.
                         Please enter your email address.
                 </message>
         </alert>
+        <alert modal="true" name="PromptMissingSubjMsg">
+                <message name="message">
+                        Send postcard with the default subject or message?
+                </message>
+                <option name="OK">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
         <alert modal="true" name="ErrorProcessingSnapshot">
                 <message name="message">
                         Error processing snapshot data
@@ -798,6 +808,17 @@ Apply those changes and quit
                         Cancel
                 </option>
         </alert>
+        <alert modal="true" name="SkipShowNextTimeDialogs">
+                <message name="message">
+                        Disable all &apos;Show next time&apos; dialogs?
+                </message>
+                <option name="OK">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
         <alert modal="true" name="CacheWillClear">
                 <message name="message">
                         Cache will be cleared after you restart [SECOND_LIFE].
@@ -3074,7 +3095,7 @@ can be attached to notecards.
                         You are a member of too many groups to join
 another one. Please leave at least one group
 before joining this one, or decline the offer.
-To leave a group select the &apos;My Groups..&apos; option
+To leave a group select the &apos;Groups..&apos; option
 from the &apos;Edit&apos; menu.
 [NAME] has invited you to join a group as a member.
 [INVITE]
@@ -3091,7 +3112,7 @@ from the &apos;Edit&apos; menu.
                         You are a member of too many groups to join
 another one. Please leave at least one group
 before joining this one, or decline the offer.
-To leave a group select the &apos;My Groups..&apos; option
+To leave a group select the &apos;Groups..&apos; option
 from the &apos;Edit&apos; menu.
 [NAME] has invited you to join a group as an officer.
 [INVITE]
@@ -4067,6 +4088,20 @@ will only work if a script is added with a money() event.
                         Cancel
                 </option>
         </alert>
+        <alert modal="true" name="ClickOpenF1Help">
+                <message name="message">
+                        Visit the Second Life Support Web site?
+                </message>
+                <ignore name="ignore">
+                        Ignore
+                </ignore>
+                <option name="Gotopage">
+                        Go
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
         <alert modal="true" name="HelpReportAbuseEmailLL" >
                 <message name="message">
 Use this tool to report violations of the Terms of Service 
@@ -4342,5 +4377,27 @@ the contents of your Lost And Found folder?
                         they are part of an attachment.
                 </message>
         </alert>
-
+        <!-- alert for more information about the debit permission -->
+        <alert modal="true" name="DebitPermissionDetails" title="About Requests for the Debit Permission">
+                <message name="message">
+                        <p>Granting this request gives a script ongoing permission to take Linden dollars (L$) from your account. To revoke this permission, the object's owner must delete the object or reset the scripts in the object.</p>
+                </message>
+                <option default="true" name="OK">
+                        OK
+                </option>
+        </alert>
+        <alert modal="true" name="AutoWearNewClothing">
+                <message name="message">
+                        Would you like to automatically wear the clothing item you create?
+                </message>
+                <ignore name="ignore">
+                        Automatically wear new clothing
+                </ignore>
+                <option name="Yes">
+                        Yes
+                </option>
+                <option name="No">
+                        No
+                </option>
+        </alert>
 </alerts>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/xui/en-us/floater_about_land.xml
index 5d85deb..9366154 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_about_land.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-554" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" can_tear_off="true" enabled="true" height="370"
-     hidden="false" left="367" min_height="100" min_width="100"
+     can_resize="true" can_tear_off="true" enabled="true" height="385"
+     hidden="false" left="367" min_height="385" min_width="460"
      mouse_opaque="true" name="floaterland" rect_control="FloaterLandRect5"
      title="About Land" width="460">
         <tab_container bottom="-370" enabled="true" height="350" hidden="false" left="0"
-             mouse_opaque="false" name="landtab" tab_position="top" width="460">
+             mouse_opaque="false" name="landtab" tab_position="top" width="460" follows="left|top|right|bottom">
                 <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
                      height="333" hidden="false" label="General" left="1" mouse_opaque="true"
                      name="land_general_panel" width="458">
@@ -16,11 +16,11 @@
                                 Name:
                         </text>
                         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-20"
-                             enabled="true" follows="left|top" font="SansSerifSmall"
+                             enabled="true" follows="left|top|right" font="SansSerifSmall"
                              handle_edit_keys_directly="false" height="16" hidden="false" left="76"
                              max_length="63" mouse_opaque="true" name="Name"
                              select_all_on_focus_received="false" select_on_focus="false"
-                             text_readonly_color="0.576471 0.662745 0.835294 1" width="286" />
+                             text_readonly_color="0.576471 0.662745 0.835294 1" width="370" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
@@ -28,11 +28,11 @@
                                 Description:
                         </text>
                         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-40"
-                             enabled="true" follows="left|top" font="SansSerifSmall"
+                             enabled="true" follows="left|top|right" font="SansSerifSmall"
                              handle_edit_keys_directly="false" height="16" hidden="false" left="76"
                              max_length="127" mouse_opaque="true" name="Description"
                              select_all_on_focus_received="false" select_on_focus="false"
-                             text_readonly_color="0.576471 0.662745 0.835294 1" width="286" />
+                             text_readonly_color="0.576471 0.662745 0.835294 1" width="370" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-60" drop_shadow_visible="true" enabled="false" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
@@ -266,10 +266,10 @@
                              width="350">
                                 Purchased land in this region may not be joined/subdivided.
                         </text>
-                        <text_editor type="string" length="1" bottom="-305" embedded_items="false" enabled="false" follows="left|top"
-                             font="SansSerifSmall" height="180" hidden="false" left="15"
+                        <text_editor type="string" length="1" bottom="-325" embedded_items="false" enabled="false" follows="left|top|right|bottom"
+                             font="SansSerifSmall" height="200" hidden="false" left="15"
                              max_length="65535" mouse_opaque="true" name="covenant_editor"
-                             text_readonly_color="1 1 1 1" width="375" word_wrap="true">
+                             text_readonly_color="1 1 1 1" width="420" word_wrap="true">
                                 There is no Covenant provided for this Estate.
                         </text_editor>
                         <text hidden="true" name="can_resell">
@@ -664,11 +664,11 @@
                                 Music URL:
                         </text>
                         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-48"
-                             enabled="true" follows="left|top" font="SansSerifSmall"
+                             enabled="true" follows="left|top|right" font="SansSerifSmall"
                              handle_edit_keys_directly="false" height="16" hidden="false" left="76"
                              max_length="255" mouse_opaque="true" name="music_url"
                              select_all_on_focus_received="true" select_on_focus="true"
-                             text_readonly_color="0.576471 0.662745 0.835294 1" width="292" />
+                             text_readonly_color="0.576471 0.662745 0.835294 1" width="370" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-76" drop_shadow_visible="true" enabled="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
@@ -695,11 +695,11 @@ texture:
                                 with content from this URL:
                         </text>
                         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-172"
-                             enabled="true" follows="left|top" font="SansSerifSmall"
+                             enabled="true" follows="left|top|right" font="SansSerifSmall"
                              handle_edit_keys_directly="false" height="16" hidden="false" left="76"
                              max_length="255" mouse_opaque="true" name="media_url"
                              select_all_on_focus_received="true" select_on_focus="true"
-                             text_readonly_color="0.576471 0.662745 0.835294 1" width="292" />
+                             text_readonly_color="0.576471 0.662745 0.835294 1" width="370" />
                         <check_box bottom="-208" enabled="true" follows="left|top" font="SansSerifSmall"
                              height="16" hidden="false" initial_value="false"
                              label="Auto scale content (slower and reduced visual quality)" left="76"
@@ -725,28 +725,30 @@ texture:
                              height="16" hidden="false" initial_value="false"
                              label="Avatars: (0 listed, 300 max)" left="4" mouse_opaque="true"
                              name="AccessCheck" radio_style="false" width="278" />
-                        <name_list allow_calling_card_drop="false" background_visible="true" bottom="-144"
-                             column_padding="5" draw_border="true" draw_heading="false"
-                             draw_stripes="true" enabled="true" follows="left|top" height="80"
+                        <name_list allow_calling_card_drop="false" background_visible="true" bottom="-234"
+                             column_padding="0" draw_border="true" draw_heading="true" heading_font="SansSerifSmall" heading_height="14"
+                             enabled="true" follows="left|top|right|bottom" height="170"
                              hidden="false" left="28" mouse_opaque="true" multi_select="false"
-                             name="AccessList" width="254" />
-                        <button bottom="-164" enabled="true" follows="left|top" font="SansSerifSmall"
+                             name="AccessList" width="400">
+                             <column label="Allowed Residents" name="name" relwidth="1.0" />
+                        </name_list>
+                        <button bottom="-264" enabled="true" follows="left|bottom" font="SansSerifSmall"
                              halign="center" height="16" hidden="false" label="Add..."
                              label_selected="Add..." left="28" mouse_opaque="true" name="Add..."
                              scale_image="true" width="64" />
-                        <button bottom="-164" enabled="false" follows="left|top" font="SansSerifSmall"
+                        <button bottom="-264" enabled="false" follows="left|bottom" font="SansSerifSmall"
                              halign="center" height="16" hidden="false" label="Remove"
                              label_selected="Remove" left="96" mouse_opaque="true" name="Remove"
                              scale_image="true" width="64" />
-                        <check_box bottom="-184" enabled="false" follows="left|top" font="SansSerifSmall"
+                        <check_box bottom="-284" enabled="false" follows="left|bottom" font="SansSerifSmall"
                              height="16" hidden="false" initial_value="false"
                              label="Sell passes allowing temporary access:" left="28"
                              mouse_opaque="true" name="PassCheck" radio_style="false" width="254" />
-                        <spinner bottom="-204" enabled="false" follows="left|top" height="16" hidden="false"
+                        <spinner bottom="-304" enabled="false" follows="left|bottom" height="16" hidden="false"
                              increment="1" initial_val="10" label="Price in L$:" label_width="128"
                              left="76" max_val="500" min_val="1" mouse_opaque="true" name="PriceSpin"
                              width="206" />
-                        <spinner bottom="-224" enabled="false" follows="left|top" height="16" hidden="false"
+                        <spinner bottom="-324" enabled="false" follows="left|bottom" height="16" hidden="false"
                              increment="0.25" initial_val="1" label="Hours of access:" label_width="128"
                              left="76" max_val="24" min_val="0.01" mouse_opaque="true" name="HoursSpin"
                              width="206" />
@@ -758,35 +760,37 @@ texture:
                              height="16" hidden="false" initial_value="false"
                              label="Ban these avatars: (0 listed, 300 max)" left="4" mouse_opaque="true"
                              name="LandBanCheck" radio_style="false" width="278" />
-                        <name_list allow_calling_card_drop="false" background_visible="true" bottom="-104"
-                             column_padding="5" draw_border="true" draw_heading="false"
-                             draw_stripes="true" enabled="true" follows="left|top" height="80"
+                        <name_list allow_calling_card_drop="false" background_visible="true" bottom="-200"
+                             column_padding="0" draw_border="true" draw_heading="true" heading_font="SansSerifSmall" heading_height="14"
+                             enabled="true" follows="left|top|right|bottom" height="170"
                              hidden="false" left="28" mouse_opaque="true" multi_select="false"
-                             name="LandBanList" width="254" />
-                        <button bottom="-124" enabled="true" follows="left|top" font="SansSerifSmall"
+                             name="LandBanList" width="400">
+                                 <column label="Banned Residents" name="name" relwidth="1.0" />
+                        </name_list>
+                        <button bottom="-230" enabled="true" follows="left|bottom" font="SansSerifSmall"
                              halign="center" height="16" hidden="false" label="Add..."
                              label_selected="Add..." left="28" mouse_opaque="true" name="Add..."
                              scale_image="true" width="64" />
-                        <button bottom="-124" enabled="false" follows="left|top" font="SansSerifSmall"
+                        <button bottom="-230" enabled="false" follows="left|bottom" font="SansSerifSmall"
                              halign="center" height="16" hidden="false" label="Remove"
                              label_selected="Remove" left="96" mouse_opaque="true" name="Remove"
                              scale_image="true" width="64" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-144" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             bottom="-260" drop_shadow_visible="true" enabled="true" follows="left|bottom"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
                              left="4" mouse_opaque="true" name="Deny by Payment Status:" v_pad="0"
                              width="278">
                                 Deny by Payment Status:
                         </text>
-                        <check_box bottom="-164" enabled="true" follows="left|top" font="SansSerifSmall"
+                        <check_box bottom="-280" enabled="true" follows="left|bottom" font="SansSerifSmall"
                              height="16" hidden="false" initial_value="false"
                              label="Deny No Payment Info On File" left="28" mouse_opaque="true"
                              name="DenyAnonymousCheck" radio_style="false" width="254" />
-                        <check_box bottom="-184" enabled="true" follows="left|top" font="SansSerifSmall"
+                        <check_box bottom="-300" enabled="true" follows="left|bottom" font="SansSerifSmall"
                              height="16" hidden="false" initial_value="false"
                              label="Deny Payment Info On File" left="28" mouse_opaque="true"
                              name="DenyIdentifiedCheck" radio_style="false" width="254" />
-                        <check_box bottom="-204" enabled="true" follows="left|top" font="SansSerifSmall"
+                        <check_box bottom="-320" enabled="true" follows="left|bottom" font="SansSerifSmall"
                              height="16" hidden="false" initial_value="false"
                              label="Deny Payment Info Used" left="28" mouse_opaque="true"
                              name="DenyTransactedCheck" radio_style="false" width="254" />
diff --git a/linden/indra/newview/skins/xui/en-us/floater_directory.xml b/linden/indra/newview/skins/xui/en-us/floater_directory.xml
index 3beb3a8..70f01fc 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_directory.xml
@@ -105,8 +105,11 @@
                                 </combo_item>
                         </combo_box>
                         <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
-                             label="Search" label_selected="Search" left_delta="142" mouse_opaque="true"
-                             name="Search" width="70" />
+                             label="Browse" label_selected="Browse" left_delta="142" mouse_opaque="true"
+                             name="Browse" width="70" />
+                        <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
+                             label="Search" label_selected="Search" mouse_opaque="true"
+                             name="Search" width="70" visible="false"/>
                         <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
                              label="Place an Ad..." label_selected="Place an Ad..." left_delta="320"
                              mouse_opaque="true" name="Place an Ad..." width="100" />
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 4b668c5..2cea9e7 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
@@ -49,9 +49,9 @@
                 </combo_item>
         </combo_box>
         <text bottom="250" follows="top|left" left="10" name="bad_image_text">
-                Unable to read image.
-        
-        Try saving image as 24 bit Targa (.tga).
+Unable to read image.
+
+Try saving image as 24 bit Targa (.tga).
         </text>
         <button bottom="10" follows="bottom|right" height="20" label="Cancel" left="182"
              name="cancel_btn" width="64" />
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 d9d8eb8..ffed294 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_inventory.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_inventory.xml
@@ -38,6 +38,10 @@
                              mouse_opaque="true" name="Show Filters" width="128">
                                 <on_click filter="" function="Inventory.ShowFilters" userdata="" />
                         </menu_item_call>
+                        <menu_item_call bottom_delta="-18" height="18" hidden="false" label="Reset Filters" left="0"
+                             mouse_opaque="true" name="Reset Current" width="118">
+                                <on_click filter="" function="Inventory.ResetFilter" userdata="" />
+                        </menu_item_call>
                         <menu_item_call bottom_delta="-18" height="18" hidden="false" label="Close All Folders"
                              left="0" mouse_opaque="true" name="Close All Folders" width="128">
                                 <on_click filter="" function="Inventory.CloseAllFolders" userdata="" />
@@ -155,18 +159,5 @@
                                 <on_click filter="" function="Inventory.SetSortBy" userdata="systemfolderstotop" />
                         </menu_item_check>
                 </menu>
-                <menu bottom_delta="28" color="0, 0, 0, 1" drop_shadow="true" height="49"
-                     hidden="false" label="Filters" left="0" mouse_opaque="false" name="Filters"
-                     opaque="true" tear_off="true" width="118">
-                        <menu_item_check bottom_delta="-18" control_name="Inventory.ShowFilters" height="18"
-                             hidden="false" label="Modify Current" left="0" mouse_opaque="true"
-                             name="Modify Current" width="118">
-                                <on_click filter="" function="Inventory.ShowFilters" userdata="" />
-                        </menu_item_check>
-                        <menu_item_call bottom_delta="-18" height="18" hidden="false" label="Reset Current" left="0"
-                             mouse_opaque="true" name="Reset Current" width="118">
-                                <on_click filter="" function="Inventory.ResetFilter" userdata="" />
-                        </menu_item_call>
-                </menu>
         </menu_bar>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_postcard.xml b/linden/indra/newview/skins/xui/en-us/floater_postcard.xml
index 26fcbcb..27780a4 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_postcard.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_postcard.xml
@@ -23,14 +23,14 @@
              name="subject_label">
                 Subject:
         </text>
-        <line_editor bottom_delta="-6" follows="left|top" height="20" left="120" max_length="100"
-             name="subject_form" width="150" />
+        <line_editor bottom_delta="-6" follows="left|top" height="20" label="Type your subject here." 
+                left="120" max_length="100" name="subject_form" width="150"  />
         <text bottom_delta="-23" follows="top|left" font="SansSerif" left="12"
              name="msg_label">
                 Message:
         </text>
-        <text_editor bottom_delta="-150" follows="left|top|right|bottom" height="140" left="12"
-             max_length="700" name="msg_form" width="420" />
+        <text_editor bottom_delta="-150" follows="left|top|right|bottom" height="140"
+                 left="12" max_length="700" name="msg_form" width="420">Type your message here.</text_editor>
         <check_box bottom_delta="-20" follows="left|bottom" height="18" label="Publish on the web"
              left="10" name="allow_publish_check"
              tool_tip="Publish this postcard on the web." />
@@ -47,4 +47,8 @@
              name="cancel_btn" width="150" />
         <button bottom_delta="0" follows="right|bottom" height="20" label="Send" left="285"
              name="send_btn" width="150" />
+             
+        <text hidden="true" name="default_subject"> Postcard from Second Life. </text>
+        <text hidden="true" name="default_message"> Check this out! </text>
+
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_texture_ctrl.xml b/linden/indra/newview/skins/xui/en-us/floater_texture_ctrl.xml
index a16448d..d0ae5da 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_texture_ctrl.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_texture_ctrl.xml
@@ -54,4 +54,5 @@
              halign="center" height="20" hidden="false" label="Select"
              label_selected="Select" left="290" mouse_opaque="true" name="Select"
              scale_image="true" width="100" />
+    <text hidden="true" name="pick title">Pick: </text>
 </floater>
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 835edec..305a5ef 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_tools.xml
@@ -97,9 +97,10 @@
         <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
              hidden="false" initial_value="false" label="Select Texture" left="4"
              mouse_opaque="true" name="radio select face" radio_style="true" width="114" />
-        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-             hidden="false" initial_value="false" label="Edit linked parts" left="4"
-             mouse_opaque="true" name="checkbox edit linked parts" width="114" />
+        <check_box bottom_delta="-15" control_name="EditLinkedParts" follows="left|top"
+             font="SansSerifSmall" height="16" hidden="false" initial_value="false"
+             label="Edit linked parts" left="4" mouse_opaque="true" 
+             name="checkbox edit linked parts" width="114" />
         <check_box bottom="-79" control_name="SnapEnabled" follows="left|top"
              font="SansSerifSmall" height="16" hidden="false" initial_value="true"
              label="Use Grid" left="118" mouse_opaque="true"
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 6d4840f..c14ba4b 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
@@ -691,6 +691,13 @@
                 </menu_item_call>
                 <menu_item_separator bottom="-243" enabled="true" height="8" hidden="false" label="-----------"
                      left="0" mouse_opaque="true" name="separator3" width="250" />
+                <menu_item_check bottom="" enabled="false" height="" hidden="false" label="Edit Linked Parts"
+                     left="" mouse_opaque="true" name="Edit Linked Parts" shortcut="" width="">
+                        <on_click function="ToggleControl" userdata="EditLinkedParts" />
+                        <on_click function="Tools.EditLinkedParts" userdata="" />
+                        <on_check control="EditLinkedParts" />
+                        <on_enable function="Tools.EnableToolNotPie" />
+                </menu_item_check>
                 <menu_item_call bottom="-262" enabled="false" height="19" hidden="false" label="Link" left="0"
                      mouse_opaque="true" name="Link" shortcut="control|L" width="250">
                         <on_click function="Tools.Link" userdata="" />
diff --git a/linden/indra/newview/skins/xui/en-us/notify.xml b/linden/indra/newview/skins/xui/en-us/notify.xml
index 54451ab..8e51bcb 100644
--- a/linden/indra/newview/skins/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/xui/en-us/notify.xml
@@ -634,7 +634,7 @@ Please notify the vendor from whom you purchased this item.
                         Failed to find [TYPE] named [DESC] in database.
                 </message>
         </notify>
-        <notify name="ScriptTakeMoney" tip="false">
+        <notify name="ScriptTakeMoney" tip="false" caution="true">
                 <message name="message">
                         Take Linden dollars (L$) from you
                 </message>
@@ -689,6 +689,7 @@ Please notify the vendor from whom you purchased this item.
                         Control your camera
                 </message>
         </notify>
+  <!-- the normal permissions prompt -->
         <notify name="ScriptQuestion" tip="false">
                 <message name="message">
                         &apos;[OBJECTNAME]&apos;, an object owned by &apos;[NAME]&apos;, would like to:
@@ -703,7 +704,39 @@ Is this OK?
                         No
                 </option>
         </notify>
-        <notify name="ScriptDialog" tip="false">
+  <!-- the special chat messages to log when caution permissions have been granted or denied -->
+  <notify name="ScriptQuestionCautionChatGranted" tip="false">
+    <message name="message">&apos;[OBJECTNAME]&apos;, an object owned by &apos;[OWNERNAME]&apos;, located in [REGIONNAME] at [REGIONPOS], has been granted permission to: [PERMISSIONS].</message>
+  </notify>
+  <notify name="ScriptQuestionCautionChatDenied" tip="false">
+    <message name="message">&apos;[OBJECTNAME]&apos;, an object owned by &apos;[OWNERNAME]&apos;, located in [REGIONNAME] at [REGIONPOS], has been denied permission to: [PERMISSIONS].</message>
+  </notify>
+  <!-- the special title to display at the top of a caution permissions prompt -->
+  <notify name="ScriptQuestionCautionWarn" tip="false">
+    <message name="message">An object wants permission to take Linden dollars (L$) from your account.</message>
+  </notify>
+  <!-- the caution permssions prompt, when auto-deny is disabled -->
+  <notify name="ScriptQuestionCaution" tip="false" caution="true">
+    <message name="message">
+      &apos;[OBJECTNAME]&apos;, an object owned by &apos;[NAME]&apos;, would like to:
+ 
+[QUESTIONS]
+If you do not trust this object and its creator, you should deny the request. For additional information, click the Details button.
+
+Grant this request?
+    </message>
+    <option name="Grant">
+      Grant
+    </option>
+    <option name="Deny" default="true">
+      Deny
+    </option>
+    <!-- details button MUST be the last button -->
+    <option name="Details">
+      Details...
+    </option>
+  </notify>
+  <notify name="ScriptDialog" tip="false">
                 <message name="message">
                         [FIRST] [LAST]&apos;s &apos;[TITLE]&apos;
 [MESSAGE]
@@ -815,6 +848,20 @@ Flexible objects may not be physical and must be phantom
 until the flexible checkbox is unchecked.
                 </message>
         </notify>
+        <notify name="FirstDebugMenus" tip="false">
+                <message name="message">
+                        You have enabled the Client and Server debugging menus. 
+These menus contain features useful for developers debugging Second Life.
+To toggle these menus on and off press Ctrl-Alt-D. On a Mac press Cmd-Opt-Shift-D.
+                </message>
+        </notify>
+        <notify name="FirstSculptedPrim" tip="false">
+                <message name="message">
+                    You are editting a sculpted prim.  
+Sculpted prims require a special texture to specify their shape.  
+You can find example sculpted textures in the system library.
+                </message>
+        </notify>
         <notify name="MaxListSelectMessage" tip="true">
                 <message name="message">
                         You may only select up to [MAX_SELECT] items
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_chat.xml
index 4b76b18..20ccfe9 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_chat.xml
@@ -38,21 +38,26 @@
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
              can_apply_immediately="true" color="1 1 1 1" control_name="AgentChatColor"
              enabled="true" follows="left|top" height="56" hidden="false" label="Users"
-             left="210" mouse_opaque="true" name="users" width="40" />
+             left="200" mouse_opaque="true" name="users" width="40" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
              can_apply_immediately="true" color="0.7 0.9 0.7 1"
              control_name="ObjectChatColor" enabled="true" follows="left|top"
-             height="56" hidden="false" label="Objects" left="272" mouse_opaque="true"
+             height="56" hidden="false" label="Objects" left="252" mouse_opaque="true"
              name="objects" width="40" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
+             can_apply_immediately="true" color="0.7 0.9 0.7 1"
+             control_name="llOwnerSayChatColor" enabled="true" follows="left|top"
+             height="56" hidden="false" label="Owner" left="304" mouse_opaque="true"
+             name="objects" width="40" />       
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
              can_apply_immediately="true" color="0 0 0 1"
              control_name="BackgroundChatColor" enabled="true" follows="left|top"
-             height="56" hidden="false" label="Bubble" left="334" mouse_opaque="true"
+             height="56" hidden="false" label="Bubble" left="356" mouse_opaque="true"
              name="background" width="40" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
              can_apply_immediately="true" color="0.6 0.6 1 1"
              control_name="HTMLLinkColor" enabled="true" follows="left|top" height="56"
-             hidden="false" label="URLs" left="396" mouse_opaque="true" name="links"
+             hidden="false" label="URLs" left="408" mouse_opaque="true" name="links"
              width="40" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-167" drop_shadow_visible="true" enabled="true" follows="left|top"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_im.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_im.xml
index e787d2a..73563ae 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_im.xml
@@ -33,34 +33,57 @@
              font="SansSerifSmall" height="16" hidden="false" initial_value="false"
              label="Show timestamps in IM" left="148" mouse_opaque="true"
              name="show_timestamps_check" radio_style="false" width="237" />
-        <check_box bottom="-105" control_name="LogInstantMessages" enabled="true"
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-105" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
+             left="12" mouse_opaque="false" name="text_box3" v_pad="0" width="128">
+                Busy Mode Response:
+        </text>
+        <text_editor type="string" length="1" bottom="-165" embedded_items="false" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="70" hidden="false" left="148"
+             max_length="255" mouse_opaque="true" name="busy_response" width="330"
+             word_wrap="true" />
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-185" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
+             left="12" mouse_opaque="false" name="text_box3" v_pad="0" width="128">
+                Logging Options:
+        </text> 
+        <check_box bottom="-205" control_name="LogInstantMessages" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" hidden="false"
              initial_value="false" label="Log Instant Messages" left="148"
              mouse_opaque="true" name="log_instant_messages" radio_style="false"
              width="237" />
-        <check_box bottom="-125" control_name="LogChat" enabled="true" follows="left|top"
+        <check_box bottom="-225" control_name="IMLogTimestamp" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+             initial_value="false" label="Show timestamps in IM Log" left="148"
+             mouse_opaque="true" name="log_instant_messages_timestamp" radio_style="false"
+             width="237" />
+        <check_box bottom="-245" control_name="LogShowHistory" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="16" hidden="false" initial_value="false"
+             label="Show end of last IM conversation" left="148" mouse_opaque="true"
+             name="log_show_history" radio_style="false" width="237" /> 
+        <check_box bottom="-265" control_name="LogChat" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" hidden="false" initial_value="false"
              label="Log Chat" left="148" mouse_opaque="true" name="log_chat"
              radio_style="false" width="237" />
-        <check_box bottom="-145" control_name="LogShowHistory" enabled="true" follows="left|top"
+        <check_box bottom="-285" control_name="LogChatTimestamp" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" hidden="false" initial_value="false"
-             label="Show end of last IM conversation" left="148" mouse_opaque="true"
-             name="log_show_history" radio_style="false" width="237" />
-        <button bottom="-167" follows="right|bottom" font="SansSerif" halign="center"
+             label="Show timestamps in Chat Log" left="148" mouse_opaque="true" name="log_chat_timestamp"
+             radio_style="false" width="237" />
+        <check_box bottom="-305" control_name="LogChatIM" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="16" hidden="false" initial_value="false"
+             label="Show incoming IM in Chat Log" left="148" mouse_opaque="true" name="log_chat_IM"
+             radio_style="false" width="237" />
+        <check_box bottom="-325" control_name="LogTimestampDate" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="16" hidden="false" initial_value="false"
+             label="Include Date with Timestamp" left="148" mouse_opaque="true" name="log_date_timestamp"
+             radio_style="false" width="237" />
+        <button bottom="-347" follows="right|bottom" font="SansSerif" halign="center"
              height="20" label="Change Path" label_selected="Change Path" left="170"
              mouse_opaque="true" name="log_path_button" width="90" />
-        <line_editor border_drop_shadow_visible="false" border_visible="false" bottom="-166"
+        <line_editor border_drop_shadow_visible="false" border_visible="false" bottom="-346"
              drop_shadow_visible="true" enabled="false" follows="top|left|right"
              font="SansSerifSmall" halign="right" height="19" left="248"
-             max_length="254" mouse_opaque="false" name="log_path_string" right="-20" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-195" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-             left="12" mouse_opaque="false" name="text_box3" v_pad="0" width="128">
-                Busy Mode Response:
-        </text>
-        <text_editor type="string" length="1" bottom="-255" embedded_items="false" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="70" hidden="false" left="148"
-             max_length="255" mouse_opaque="true" name="busy_response" width="330"
-             word_wrap="true" />
+             max_length="254" mouse_opaque="false" name="log_path_string" right="-20" />        
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_popups.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_popups.xml
index 24c3b19..f471256 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_popups.xml
@@ -4,13 +4,13 @@
         <text bottom="-20" follows="top|left" left="15" width="300">
                 Do not show popups:
         </text>
-        <scroll_list follows="top|left" height="100" left="15" name="disabled_popups" width="480" />
+        <scroll_list follows="top|left" height="88" left="15" name="disabled_popups" width="480" />
         <button follows="top|left" height="20" label="Enable this popup" left="15"
              name="enable_popup" width="150" />
         <text follows="top|left" left="15" width="128">
                 Show popups:
         </text>
-        <scroll_list follows="top|left" height="100" left="15" name="enabled_popups" width="480" />
+        <scroll_list follows="top|left" height="88" left="15" name="enabled_popups" width="480" />
              
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
@@ -32,6 +32,12 @@
              width="270" />
 
         <button bottom_delta="-35" follows="top|left" height="20"
-             label="Reset &apos;Show next time&apos; Dialogs..." left="15"
-             name="reset_dialogs_btn" width="210" />
+             label="Show all &apos;Skip next time&apos; Dialogs..." left="15"
+             name="reset_dialogs_btn" width="210" 
+             tool_tip="Enable all of the optional popups and 'first time use' notifications."/>
+
+        <button bottom_delta="0" follows="top|right" height="20"
+             label="Skip all &apos;Skip next time&apos; Dialogs..." left="-225"
+             name="skip_dialogs_btn" width="210" 
+             tool_tip="Disable all of the optional popups and 'first time use' notifications."/>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_debug.xml b/linden/indra/newview/skins/xui/en-us/panel_region_debug.xml
index b5c6858..fb917f6 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_debug.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_region_debug.xml
@@ -53,7 +53,7 @@
              tool_tip="Give 2 minute countdown and restart region" width="100" />
         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
              left="120" name="restart_help" width="18" />
-        <button bottom_delta="-20" follows="left|top" height="20" label="Cancel Restart"
-             left="10" name="cancel_restart_btn" tool_tip="Cancel region restart"
+        <button bottom_delta="-20" follows="left|top" height="20" label="Delay Restart"
+             left="10" name="cancel_restart_btn" tool_tip="Delay region restart by one hour"
              width="100" />
 </panel>