62 files changed, 743 insertions, 737 deletions
diff --git a/linden/indra/newview/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml
index 608ba55..3b85efa 100644
--- a/linden/indra/newview/skins/default/colors_base.xml
+++ b/linden/indra/newview/skins/default/colors_base.xml
@@ -37,6 +37,7 @@
 <ButtonUnselectedBgColor value="62, 62, 62, 255" />
 <ButtonUnselectedFgColor value="255, 255, 255, 255" />
 <ButtonBorderColor value="239, 156, 0, 255" />
+<ButtonFlashBgColor value="255, 190, 62, 127" />
 <ButtonColor value="255, 255, 255, 255" />              <!-- Blended with button art, usually left as opaque white -->
 <ButtonImageColor value="255, 255, 255, 255" />         <!-- Blended with button art, usually left as opaque white -->
diff --git a/linden/indra/newview/skins/default/textures/textures.xml b/linden/indra/newview/skins/default/textures/textures.xml
index 88e6dfc..9e1d9b5 100644
--- a/linden/indra/newview/skins/default/textures/textures.xml
+++ b/linden/indra/newview/skins/default/textures/textures.xml
@@ -365,10 +365,8 @@
  <texture name="icn_label_music.tga"/>
  <texture name="icn_label_media.tga"/>
  <texture name="arrow_down.tga"/>
-  <texture name="skin_thumbnail_modern.png" preload="true"/>
-  <texture name="skin_thumbnail_classic.png" preload="true"/>
  <texture name="cloud-particle.j2c" use_mips="true"/>
  
  <texture name="skin_thumbnail_default.png" preload="true" />
  <texture name="skin_thumbnail_silver.png" preload="true" />
-</textures>
-\ No newline at end of file
+</textures>
diff --git a/linden/indra/newview/skins/default/xui/de/alerts.xml b/linden/indra/newview/skins/default/xui/de/alerts.xml
index d829632..3292470 100644
--- a/linden/indra/newview/skins/default/xui/de/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/de/alerts.xml
@@ -3219,20 +3219,6 @@ erscheint Ihre Anzeige weiter oben in der Liste.
                        Abbrechen
                </option>
        </alert>
-        <alert name="WebLaunchReleaseNotes">
-                <message name="message">
-                        Die Release-Hinweise von [SECOND_LIFE] anzeigen?
-                </message>
-                <ignore name="ignore">
-                        Beim Starten eines Browsers, um die Versionshinweise anzuzeigen
-                </ignore>
-                <option name="Gotopage">
-                        OK
-                </option>
-                <option name="Cancel">
-                        Abbrechen
-                </option>
-        </alert>
        <alert name="ReturnToOwner">
                <message name="message">
                        Möchten Sie die ausgewählten Objekte
@@ -3313,7 +3299,7 @@ Diese Gruppe verlassen?
                        Stummschalten nach Name betrifft nur Chat und IM, keine Sounds. 
 Sie müssen den Objektnamen exakt angeben.
                </message>
-                <editline>
+                <editline name="editline">
                        Objektname
                </editline>
                <option name="OK">
@@ -3445,7 +3431,7 @@ Die Option zum Austritt aus einer Gruppe finden Sie unter
                <message name="message">
                        Beim Hinauswerfen dieses Benutzers welche Meldung anzeigen?
                </message>
-                <editline>
+                <editline name="editline">
                        Sie wurden von einem Administrator abgemeldet.
                </editline>
                <option name="OK">
@@ -3459,7 +3445,7 @@ Die Option zum Austritt aus einer Gruppe finden Sie unter
                <message name="message">
                        Beim Hinauswerfen aller Personen vom Grid welche Meldung anzeigen?
                </message>
-                <editline>
+                <editline name="editline">
                        Sie wurden von einem Administrator abgemeldet.
                </editline>
                <option name="OK">
@@ -3473,7 +3459,7 @@ Die Option zum Austritt aus einer Gruppe finden Sie unter
                <message name="message">
                        Beim Einfrieren dieses Benutzers welche Meldung anzeigen?
                </message>
-                <editline>
+                <editline name="editline">
                        Sie wurden eingefroren. Bewegen oder Chatten ist nicht mehr möglich. Ein Administrator wird sich über IM an Sie wenden
                </editline>
                <option name="OK">
@@ -3487,7 +3473,7 @@ Die Option zum Austritt aus einer Gruppe finden Sie unter
                <message name="message">
                        Beim Auftauen dieses Benutzers welche Meldung anzeigen?
                </message>
-                <editline>
+                <editline name="editline">
                        Sie sind nicht mehr eingefroren.
                </editline>
                <option name="OK">
@@ -3512,7 +3498,7 @@ Die Option zum Austritt aus einer Gruppe finden Sie unter
                <message name="message">
                        Teleport an Ihre Position mit der folgenden Meldung anbieten?
                </message>
-                <editline>
+                <editline name="editline">
                        Triff mich in [REGION]
                </editline>
                <option name="OK">
@@ -3526,7 +3512,7 @@ Die Option zum Austritt aus einer Gruppe finden Sie unter
                <message name="message">
                        Benutzer an Ihrem Standort herbeirufen?
                </message>
-                <editline>
+                <editline name="editline">
                        Triff mich in [REGION]
                </editline>
                <option name="OK">
@@ -4944,13 +4930,15 @@ Wolkendichte.
                <message name="message">
                        Wählen Sie einen Namen für den neuen Himmel.
                </message>
+                <editline name="editline">
+                        Neue Voreinstellung
+                </editline>
                <option name="OK">
                        OK
                </option>
                <option name="Cancel">
                        Abbrechen
                </option>
-                Neue Voreinstellung
        </alert>
        <alert name="ExistsSkyPresetAlert">
                <message name="message">
@@ -4961,13 +4949,15 @@ Wolkendichte.
                <message name="message">
                        Wählen Sie einen Namen für die neue Wasservoreinstellung.
                </message>
+                <editline name="editline">
+                        Neue Voreinstellung
+                </editline>
                <option name="OK">
                        OK
                </option>
                <option name="Cancel">
                        Abbrechen
                </option>
-                Neue Voreinstellung
        </alert>
        <alert name="ExistsWaterPresetAlert">
                <message name="message">
diff --git a/linden/indra/newview/skins/default/xui/de/floater_html.xml b/linden/indra/newview/skins/default/xui/de/floater_html.xml
index 7e97d4f..5d5877e 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_html.xml
@@ -8,4 +8,7 @@
        <string name="home_page_url">
                http://de.secondlife.com
        </string>
+        <string name="support_page_url">
+                http://de.secondlife.com/support
+        </string>       
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/panel_region_estate.xml b/linden/indra/newview/skins/default/xui/de/panel_region_estate.xml
index dec1bb3..6dd4be0 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_region_estate.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_region_estate.xml
@@ -43,9 +43,6 @@
        <check_box label="Verweigern - keine archivierte Zahlungsinfo" name="deny_anonymous" />
        <check_box label="Verweigern - Zahlungsinfo archiviert" name="deny_identified" />
        <check_box label="Verweigern - Zahlungsinfo verwendet" name="deny_transacted" />
-        <text name="abuse_email_text">
-                [Abuse E-mail Beta]
-        </text>
        <button label="Übernehmen" name="apply_btn" />
        <text name="estate_manager_label">
                Grundstücksverwalter:
diff --git a/linden/indra/newview/skins/default/xui/en-us/LCD_text.xml b/linden/indra/newview/skins/default/xui/en-us/LCD_text.xml
deleted file mode 100644
index b9c1200..0000000
--- a/linden/indra/newview/skins/default/xui/en-us/LCD_text.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bottom="0" follows="left|top|right|bottom" height="600" left="0"
-     mouse_opaque="true" name="panel_login" visible="false" width="800">
-        <string name="DebugInfo">
-                Debug Info
-        </string>
-        <string name="FPS">
-                FPS
-        </string>
-        <string name="SimFPS">
-                SimFPS
-        </string>
-        <string name="Pin">
-                P-In
-        </string>
-        <string name="Pout">
-                P-Out
-        </string>
-        <string name="PLoss">
-                P-Loss
-        </string>
-        <string name="Ping">
-                Ping
-        </string>
-        <string name="AccountDetails">
-                Account Details
-        </string>
-        <string name="LBal">
-                L$ bal
-        </string>
-        <string name="Time">
-                Time
-        </string>
-        <string name="LocationDetails1">
-                Location Details 1
-        </string>
-        <string name="LocationDetails2">
-                Location Details 2
-        </string>
-        <string name="Region">
-                Region
-        </string>
-        <string name="Parcel">
-                Parcel
-        </string>
-        <string name="Pos">
-                Pos
-        </string>
-        <string name="Sqm">
-                Sqm
-        </string>
-        <string name="Owner">
-                Owner
-        </string>
-        <string name="Type">
-                Type
-        </string>
-        <string name="Yes">
-                Yes
-        </string>
-        <string name="No">
-                No
-        </string>
-        <string name="Forsale">
-                ForSale
-        </string>
-        <string name="Traffic">
-                Traffic
-        </string>
-        <string name="Last3ChatLines">
-                Last 3 Chat Lines
-        </string>
-        <string name="Last3IMLines">
-                Last 3 IM Lines
-        </string>
-</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index c7ec62f..8b17754 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -367,9 +367,9 @@ according to the Community Standards.
        </alert>
        <alert modal="true" name="ClickPublishHelpAvatar">
                <message name="message">
-                        Selecting &quot;Show in Search&quot; will show:
+Selecting &quot;Show in Search&quot; will show:
-                        - my profile in search results
+- my profile in search results
-                        - a link to my profile in public group pages
+- a link to my profile in public group pages
                </message>
        </alert>
        <alert modal="true" name="ClickPartnerHelpAvatar">
@@ -387,12 +387,13 @@ Go to the Second Life web site for more information on partnering?
        </alert>
        <alert modal="true" name="ClickWebProfileHelpAvatar">
                <message name="message">
-                        If this resident has a web profile URL set then you can:
+                        If this resident has set a web profile URL then you can:
- * Click Load to load the page with the embedded web browser.
+ * Click "Load" to load the page with the embedded web browser.
- * Click Open to view externally in your default web browser.
+ * Click Load->"Open in external browser" to view externally.
+ * Click Load->"Home URL" to return to resident's web profile if you've navigated away.
 
-When viewing your profile you can enter any URL as your Web Profile.
+When viewing your own profile you can enter any URL as your web profile and click OK to set it.
-Residents can visit the URL you specify when they view your profile.
+Other residents can visit the URL you set when they view your profile.
                </message>
        </alert>
        <alert modal="true" name="ClickWebProfileNoWebHelpAvatar">
@@ -674,7 +675,7 @@ to set its Landing Point.
        </alert>
        <alert modal="true" name="PromptMissingSubjMsg">
                <message name="message">
-                        Send postcard with the default subject or message?
+                        Email snapshot with the default subject or message?
                </message>
                <option name="OK">
                        OK
@@ -695,7 +696,7 @@ to set its Landing Point.
        </alert>
        <alert modal="true" name="ErrorUploadingPostcard">
                <message name="message">
-                        There was a problem uploading a postcard due to the following reason: [REASON]
+                        There was a problem sending a snapshot due to the following reason: [REASON]
                </message>
        </alert>
        <alert modal="true" name="ErrorUploadingReportScreenshot">
@@ -734,14 +735,16 @@ The outfit folder contains no clothing, body parts, or attachments.
        </alert>
        <alert modal="true" name="MustHaveAccountToLogIn">
                <message name="message">
-                        You must have an account to connect to [SECOND_LIFE].
+Oops! Something was left blank.
-Go to www.secondlife.com to create an account?
+You need to enter both the First and Last name of your avatar.
-                </message>
+You need an account to enter [SECOND_LIFE]. Would you like to create one now?
+</message>
                <option name="OK">
-                        OK
+                        Create a new account
                </option>
                <option name="Cancel">
-                        Cancel
+                        Try again
                </option>
        </alert>
        <alert modal="true" name="AddClassified">
@@ -849,7 +852,7 @@ Apply those changes and quit?
        </alert>
        <alert modal="true" name="ResetShowNextTimeDialogs">
                <message name="message">
-                        Reset all &apos;Show next time&apos; dialogs?
+                        Would you like to re-enable all these popups, which you previously indicated &apos;Don&apos;t show me again&apos;?
                </message>
                <option name="OK">
                        OK
@@ -860,7 +863,7 @@ Apply those changes and quit?
        </alert>
        <alert modal="true" name="SkipShowNextTimeDialogs">
                <message name="message">
-                        Disable all &apos;Show next time&apos; dialogs?
+                        Would you like to disable all popups which can be skipped?
                </message>
                <option name="OK">
                        OK
@@ -1344,7 +1347,7 @@ Do you really want to give these items?
        <alert modal="true" name="CannotGiveCategory">
                <message name="message">
                        You do not have permission to transfer
-                        the selected folder.
+the selected folder.
                </message>
        </alert>
        <alert modal="true" name="FreezeAvatar">
@@ -1781,7 +1784,7 @@ No parcel selected.
        <alert modal="true" name="CannotBuyLandNoRegion">
                <message name="message">
                        Unable to buy land:
-                        Cannot find the region this land is in.
+Cannot find the region this land is in.
                </message>
        </alert>
        <alert modal="true" name="CannotCloseFloaterBuyLand">
@@ -2079,15 +2082,12 @@ www.secondlife.com/support.
        </alert>
        <alert modal="true" name="YouHaveBeenLoggedOut">
                <message name="message">
-                        You have been logged out of [SECOND_LIFE]:
+You have been logged out of [SECOND_LIFE]:
-[MESSAGE]
+            [MESSAGE]
+You can still look at existing IM and chat by clicking 'View IM &amp; Chat'. Otherwise, click 'Quit' to exit [SECOND_LIFE] immediately.
-Click Continue to look at existing IM and chat.
+    </message>
-You will not be able to perform any other operations.
+    <option name="Continue">
-Click Quit to exit [SECOND_LIFE] immediately.
+                        View IM &amp; Chat
-                </message>
-                <option name="Continue">
-                        Continue
                </option>
                <option name="Quit">
                        Quit
@@ -2101,12 +2101,14 @@ You do not have permission to buy land for your active group.
        </alert>
        <alert modal="true" name="AddFriend" title="Add Friend">
                <message name="message">
-                        Friends can give permissions to 
+                        Friends can give permissions to track each 
-track each other on the map and 
+other on the map and receive online status updates. 
-receive online status updates. 
 Offer friendship to [NAME]?
                </message>
+                <editline name="editline">
+                        Would you be my friend?
+                </editline>
                <option name="Offer">
                        OK
                </option>
@@ -2593,24 +2595,10 @@ Please select only one object and try again.
                        Cancel
                </option>
        </alert>
-        <alert modal="true" name="ReturnScriptedOnOthersLand">
+        <alert modal="true" name="EstateObjectReturn">
-                <message name="message">
-                        Are you sure you want to return all scripted objects owned by
-** [USER_NAME] **
-on all land in this region they do not own?
-                </message>
-                <option name="Return">
-                        OK
-                </option>
-                <option default="true" name="Cancel">
-                        Cancel
-                </option>
-        </alert>
-        <alert modal="true" name="ReturnScriptedOnAllLand">
                <message name="message">
-                        Are you sure you want to return ALL scripted objects owned by
+                        Are you sure you want to return objects owned by
-** [USER_NAME] **
+[USER_NAME] ?
-on ALL LAND in this region?
                </message>
                <option name="Return">
                        OK
@@ -2984,20 +2972,6 @@ Download to your Applications folder?
                        Cancel
                </option>
        </alert>
-        <alert modal="true" name="WebLaunchReleaseNotes">
-                <message name="message">
-                        View the [SECOND_LIFE] Release Notes?
-                </message>
-                <ignore name="ignore">
-                        When launching web browser to view the Release Notes
-                </ignore>
-                <option name="Gotopage">
-                        OK
-                </option>
-                <option name="Cancel">
-                        Cancel
-                </option>
-        </alert>
        <alert modal="true" name="ReturnToOwner">
                <message name="message">
                        Are you sure you want to return the selected
@@ -3195,7 +3169,7 @@ from the &apos;Edit&apos; menu.
                <message name="message">
                        Kick this user with what message?
                </message>
-                <editline>
+                <editline name="editline">
                        An administrator has logged you off.
                </editline>
                <option name="OK">
@@ -3209,7 +3183,7 @@ from the &apos;Edit&apos; menu.
                <message name="message">
                        Kick everyone currently on the grid with what message?
                </message>
-                <editline>
+                <editline name="editline">
                        An administrator has logged you off.
                </editline>
                <option name="OK">
@@ -3223,7 +3197,7 @@ from the &apos;Edit&apos; menu.
                <message name="message">
                        Freeze this user with what message?
                </message>
-                <editline>
+                <editline name="editline">
                        You have been frozen. You cannot move or chat. An administrator will contact you via instant message (IM).
                </editline>
                <option name="OK">
@@ -3237,7 +3211,7 @@ from the &apos;Edit&apos; menu.
                <message name="message">
                        Unfreeze this user with what message?
                </message>
-                <editline>
+                <editline name="editline">
                        You are no longer frozen.
                </editline>
                <option name="OK">
@@ -3263,7 +3237,7 @@ from the &apos;Edit&apos; menu.
                <message name="message">
                        Offer a teleport to your location with the following message?
                </message>
-                <editline>
+                <editline name="editline">
                        Join me in [REGION]
                </editline>
                <option name="OK">
@@ -3277,7 +3251,7 @@ from the &apos;Edit&apos; menu.
                <message name="message">
                        God summon user to your location?
                </message>
-                <editline>
+                <editline name="editline">
                        Join me in [REGION]
                </editline>
                <option name="OK">
@@ -3306,7 +3280,7 @@ from the &apos;Edit&apos; menu.
                        Type a short announcement which will be
 sent to everyone currently in your estate.
                </message>
-                <editline />
+                <editline name="editline" />
                <option name="OK">
                        OK
                </option>
@@ -3597,7 +3571,7 @@ Does this group contain Mature content?
                        Type a short announcement which will be
 sent to everyone in this region.
                </message>
-                <editline />
+                <editline name="editline" />
                <option name="OK">
                        OK
                </option>
@@ -4385,19 +4359,18 @@ Entering an accurate description helps us file and process bug reports.
        <alert modal="true" name="HelpReportAbuseContainsCopyright">
                <message name="message">
                        Dear Resident,
- 
-Reports about copyright infringement can only be submitted
-as described at http://secondlife.com/corporate/dmca.php.
-Reports concerning copyright infringement will automatically
+If you are reporting intellectual property infringement, please make sure you are reporting it correctly:
-be discarded if they are submitted through the &apos;Abuse Report&apos;
-feature. If your report does not relate to copyright infringement,
+(1) The Abuse Process. You may submit an abuse report if you believe a Resident is exploiting the Second Life permissions system, for example, by using CopyBot or similar copying tools, to infringe intellectual property rights. The Abuse Team investigates and issues appropriate disciplinary action for behavior that violates the Second Life Community Standards or Terms of Service. However, the Abuse Team does not handle and will not respond to requests to remove content from the Second Life world.
-you may close this window and finish submitting your report.
- 
+(2) The DMCA or Content Removal Process. To request removal of content from Second Life, you must submit a valid notification of infringement as provided in our DMCA Policy at http://secondlife.com/corporate/dmca.php.
+If you still wish to continue with the abuse process, please close this window and finish submitting your report.
 Thank you,
- 
-Linden Lab
+Linden Lab</message>
-                </message>
        </alert>
        <alert modal="true" name="FailedRequirementsCheck">
                <message name="message">
@@ -4467,8 +4440,7 @@ the contents of your Trash folder?
        </alert>
        <alert modal="true" name="ConfirmClearCookies">
                <message name="message">
-                        Are you sure you want to clear 
+                        Are you sure you want to clear your cookies?
-your cookies?
                </message>
                <option default="true" name="Yes">
                        Yes
@@ -4829,7 +4801,7 @@ with the the D slider.
                <message name="message">
                        Give me a name for the new sky.
                </message>
-                <editline>
+                <editline name="editline">
                        New Preset
                </editline>
                <option name="OK">
@@ -4848,7 +4820,7 @@ with the the D slider.
                <message name="message">
                        Give me a name for the new water preset.
                </message>
-                <editline>
+                <editline name="editline">
                        New Preset
                </editline>
                <option name="OK">
@@ -4907,7 +4879,7 @@ with the the D slider.
        <alert modal="true" name="Cannot_Purchase_an_Attachment">
                <message name="message">
                        Items may not be purchased while
-                        they are part of an attachment.
+they are part of an attachment.
                </message>
        </alert>
        <alert modal="true" name="DebitPermissionDetails"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
index 3f6e6b2..fc1b747 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
@@ -227,6 +227,10 @@
                        <string name="sale_pending_text">
                                (Sale Pending)
                        </string>
+                        <string name="no_selection_text">
+                        No parcel selected.
+Go to World menu > About Land or select another parcel to show its details.
+                        </string>
                </panel>
                <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
                     height="333" label="Covenant" left="0" mouse_opaque="true"
@@ -310,7 +314,7 @@
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="parcel_object_bonus" v_pad="0" visible="fakse"
+                             mouse_opaque="true" name="parcel_object_bonus" v_pad="0" visible="false"
                             width="364">
                                Region Object Bonus Factor: [BONUS]
                        </text>
@@ -463,6 +467,7 @@
                                <column name="online_status" width="-1" />
                                <column name="name" dynamicwidth="true" label="Name" />
                                <column name="count" label="Count" width="70" />
+                                <column label="Most Recent" width="160" />
                        </name_list>
                </panel>
                <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
@@ -819,7 +824,7 @@ Options:
                             tool_tip="Ban residents who have not verified their age. See support.secondlife.com for more information."
                             width="278" />
                        <string name="estate_override">
-                                One ore more of these options is set at the estate level
+                                One or more of these options is set at the estate level
                        </string>
                        <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
                             height="16" initial_value="false" label="Allow Group Access: [GROUP]"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_critical.xml b/linden/indra/newview/skins/default/xui/en-us/floater_critical.xml
index 5ce1f5c..4d1d10d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_critical.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_critical.xml
@@ -3,17 +3,17 @@
     can_resize="false" height="500" min_height="100" min_width="100"
     name="modal container" title="" width="600">
        <button bottom="15" font="SansSerif" halign="center" height="20" label="Continue"
-             label_selected="Continue" left="370" mouse_opaque="true" name="Continue"
+             label_selected="Continue" left="484" mouse_opaque="true" name="Continue"
             width="100" />
        <button bottom="15" font="SansSerif" halign="center" height="20" label="Cancel"
-             label_selected="Cancel" left_delta="108" mouse_opaque="true" name="Cancel"
+             label_selected="Cancel" left="16" mouse_opaque="true" name="Cancel"
             width="100" />
        <!-- No title text here because our "critical message" is usually the
        community standards. JC -->
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bottom="-35" drop_shadow_visible="true" follows="left|top" font="SansSerif" h_pad="0" halign="left" height="20" left="20" mouse_opaque="true" name="tos_heading" v_pad="0" width="552">
                Please read the following message carefully.
        </text>
-        <text_editor bottom="45" embedded_items="false" follows="left|top" font="SansSerif" left="20" max_length="65536" mouse_opaque="true" text_readonly_color="255,255,255,255" bg_readonly_color="0, 30, 80, 200" name="tos_text" right="-20" top="-45" word_wrap="true">
+        <text_editor bottom="45" embedded_items="false" follows="left|top" font="SansSerif" left="20" max_length="65536" mouse_opaque="true" text_readonly_color="0,0,0,255" bg_readonly_color="255,255,255,255" name="tos_text" right="-20" top="-45" word_wrap="true">
                TOS_TEXT
        </text_editor>
 </floater>
 \ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_html.xml b/linden/indra/newview/skins/default/xui/en-us/floater_html.xml
index 227e41b..d107454 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_html.xml
@@ -19,4 +19,7 @@
        <string name="home_page_url">
                http://www.secondlife.com
        </string>
+        <string name="support_page_url">
+                http://support.secondlife.com
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index cb27be6..cce06b5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -16,6 +16,9 @@
        <string name="hang_up">
                Call ended
        </string>
+        <string name="inventory_item_offered">
+                Inventory item offered
+        </string>
        <string name="voice_icon">
                icn_voice-pvtfocus.tga
        </string>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml
index b47c788..eea285c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml
@@ -42,7 +42,7 @@
                        <button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
                             label_selected="&gt; &gt;" left="463" name="toggle_active_speakers_btn"
                             right="496"
-                             tool_tip="Click here to toggle list of active partipants in this IM session."
+                             tool_tip="Click here to toggle a list of active participants in this IM session."
                             visible="true" width="80" />
                        <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
                             bottom="-265" embedded_items="false" enabled="false"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
index 6606980..31d80f6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater border="true" bottom="-297" can_close="true" can_drag_on_left="false"
-     can_minimize="false" can_resize="true" default_tab_group="1" enabled="true"
+     can_minimize="true" can_resize="true" default_tab_group="1" enabled="true"
     follows="left|top|right|bottom" height="296" label="(unknown)" left="1"
     min_height="200" min_width="360" mouse_opaque="true" name="im_floater"
     rect_control="" title="(unknown)" width="501">
@@ -29,7 +29,7 @@
                [NAME] is typing...
        </string>
        <string name="session_start_string">
-                Starting session with [NAME] please wait.
+                Starting session with [NAME], please wait.
        </string>
        <string name="moderated_chat_label">
                (Moderated)
@@ -38,7 +38,7 @@
                Click here to instant message.
        </string>
        <string name="muted_text_label">
-                Text chat has been disabled by a Group Moderator.
+                Your text chat has been disabled by a Group Moderator.
        </string>
        <layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="276" left="0"
             orientation="horizontal" tab_group="1" width="495" name="panels">
@@ -57,7 +57,7 @@
                        <button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
                             label_selected="&gt; &gt;" left="143" name="toggle_active_speakers_btn"
                             right="176"
-                             tool_tip="Click here to toggle list of active partipants in this IM session."
+                             tool_tip="Click here to toggle a list of active participants in this IM session."
                             visible="true" width="30" />
                        <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
                             bottom="30" embedded_items="false" enabled="false"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml b/linden/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml
index 4fa24dd..7b2c6b6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml
@@ -66,7 +66,8 @@
             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
             mouse_opaque="true" name="server_lag_cause" right="-32" v_pad="0" />
        <button bottom="5" follows="left|top" font="SansSerif" halign="center" height="18"
-             help_url="http://secondlife.com/support" label="?" mouse_opaque="true"
+             help_url="https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=4851" 
+             label="?" mouse_opaque="true"
             name="server_help" right="-10" width="18" />
        <button bottom="5" follows="left|top" font="SansSerif" halign="center" height="20"
             label="&gt;&gt;" left="5" mouse_opaque="true" name="minimize" width="25" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_live_lsleditor.xml b/linden/indra/newview/skins/default/xui/en-us/floater_live_lsleditor.xml
index 1d4dcb9..2e91a82 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_live_lsleditor.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_live_lsleditor.xml
@@ -9,6 +9,9 @@
        <check_box bottom="-545" enabled="false" follows="left|bottom" font="SansSerif"
             height="18" initial_value="true" label="Running" left="12"
             mouse_opaque="true" name="running" radio_style="false" width="100" />
+        <check_box bottom="-545" enabled="false" follows="left|bottom" font="SansSerif"
+             height="18" hidden="false" initial_value="true" label="Mono" left="82"
+             mouse_opaque="true" name="mono" radio_style="false" width="100" />
        <panel bottom="-524" enabled="true" follows="left|top|right|bottom" height="506"
             left="1" name="script ed panel" width="497" border_drop_shadow_visible="false" border_visible="false" bevel_style="none" border_style="line" border_thickness="0" />
        <string name="not_allowed">
@@ -17,4 +20,4 @@
        <string name="script_running">
                Running
        </string>
-</floater>
-\ No newline at end of file
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_mem_leaking.xml b/linden/indra/newview/skins/default/xui/en-us/floater_mem_leaking.xml
new file mode 100644
index 0000000..e7e973e
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_mem_leaking.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="500" left="100" can_close="true" can_drag_on_left="false" can_minimize="false"
+     can_resize="false" follows="left|top" height="175" name="MemLeak"
+     title="Memory Leaking Simulation" width="350">                                     
+        <spinner bottom="125" decimal_digits="0" follows="left|top" height="20"
+             increment="256" label="Leaking Speed (bytes per frame):" label_width="180" left="10" max_val="4294967296"
+             min_val="0" initial_val="512" name="leak_speed" width="330" />
+        <spinner bottom_delta="-25" decimal_digits="0" follows="left|top" height="20"
+             increment="4" label="Max Leaked Memory (MB):" label_width="180" left="10" max_val="4096"
+             min_val="0" initial_val="512" name="max_leak" width="330" />
+        <text bottom_delta="-25" follows="left|top" height="25" left="10" name="total_leaked_label"
+             width="300">
+                Current leaked memory: [SIZE] KB
+        </text> 
+        <text bottom_delta="-25" follows="left|top" height="25" left="10" name="note_label_1"
+             width="330">
+                [NOTE1]
+        </text>
+        <text bottom_delta="-25" follows="left|top" height="25" left="10" name="note_label_2"
+             width="330">
+                [NOTE2]
+        </text> 
+        <button bottom="10" follows="left|top" height="20" label="Start" left="10"
+             name="start_btn" width="60" />
+        <button bottom_delta="0" follows="left|top" height="20" label="Stop" left="100"
+             name="stop_btn" width="60" />
+        <button bottom_delta="0" follows="left|top" height="20" label="Release" left="190"
+             name="release_btn" width="60" />
+        <button bottom_delta="0" follows="left|top" height="20" label="Close" left="280"
+             name="close_btn" width="60" />     
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml b/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml
index e688ae3..631db0d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="false"
     can_resize="true" height="380" min_height="380" min_width="450"
-     name="Postcard" title="Send Postcard" width="450">
+     name="Postcard" title="Email Snapshot" width="450">
        <text bottom="-35" follows="top|left" font="SansSerif" left="12" name="to_label">
                Recipient&apos;s Email:
        </text>
@@ -36,7 +36,7 @@
        </text_editor>
        <text bottom_delta="-37" follows="left|bottom" font="SansSerifSmall" left="12"
             name="fine_print">
-                If your postcard recipient joins SL, you&apos;ll get a referral bonus.
+                If your recipient joins SL, you&apos;ll get a referral bonus.
        </text>
        <button bottom_delta="-32" follows="right|bottom" height="20" label="Cancel"
             name="cancel_btn" right="-10" width="100" />
@@ -48,4 +48,7 @@
        <string name="default_message">
                Check this out!
        </string>
+        <string name="upload_message">
+         "Sending..."
+        </string>       
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_report_abuse.xml b/linden/indra/newview/skins/default/xui/en-us/floater_report_abuse.xml
index 5055885..00ee9ac 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_report_abuse.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_report_abuse.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="560" min_height="100" min_width="100"
+     can_resize="false" height="590" min_height="100" min_width="100"
     name="floater_report_abuse" title="Report Abuse" width="390">
        <texture_picker allow_no_texture="true" bottom="-150" default_image_name="None"
             follows="left|top" height="114" label="" left="238" mouse_opaque="true"
             name="screenshot" width="134" />
-        <check_box bottom_delta="-16" follows="left|top" font="SansSerifSmall" height="16"
+        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Include screenshot" left="234"
+             initial_value="false" label="Include screenshot" left="13"
             mouse_opaque="true" name="screen_check" width="116" />
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-48" drop_shadow_visible="true" follows="left|top"
@@ -45,12 +45,12 @@
                {128.1, 128.1, 15.4}
        </text>
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
+             bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
             mouse_opaque="true" name="select_object_label" v_pad="0" width="220">
                Click the button then the object:
        </text>
-        <button bottom_delta="-32" font="SansSerif" halign="center" height="32" label=""
+        <button bottom_delta="-30" font="SansSerif" halign="center" height="32" label=""
             label_selected="" left="16" mouse_opaque="true" name="pick_btn"
             tool_tip="Object Picker - Identify an object as the subject of this report"
             width="32" />
@@ -78,37 +78,90 @@
             mouse_opaque="true" name="owner_name" v_pad="0" width="109">
                Hendrerit Vulputate
        </text>
-        <combo_box bottom_delta="-28" follows="left|top" height="20" left="16" mouse_opaque="true"
+        <combo_box bottom_delta="-48" follows="left|top" height="20" left="16" mouse_opaque="true"
             name="category_combo"
             tool_tip="Category -- select the category that best describes this report"
-             width="180">
+             width="356">
-                <combo_item name="Selectcategory" value="0">
+<combo_item name="Select_category" value="0">
-                        Select category
+Select category
-                </combo_item>
+</combo_item><combo_item name="Age__Age_play" value="31">
-                <combo_item name="Intolerance" value="23">
+Age > Age play
-                        Intolerance
+</combo_item><combo_item name="Age__Adult_resident_on_Teen_Second_Life" value="32">
-                </combo_item>
+Age > Adult resident on Teen Second Life
-                <combo_item name="Harassment" value="24">
+</combo_item><combo_item name="Age__Underage_resident_on_Adult_Second_Life" value="33">
-                        Harassment
+Age > Underage resident on Adult Second Life
-                </combo_item>
+</combo_item><combo_item name="Assault__Combat_sandbox___unsafe_area" value="34">
-                <combo_item name="Assault" value="25">
+Assault > Combat sandbox / unsafe area
-                        Assault
+</combo_item><combo_item name="Assault__Safe_area" value="35">
-                </combo_item>
+Assault > Safe area
-                <combo_item name="Disclosure" value="26">
+</combo_item><combo_item name="Assault__Weapons_testing_sandbox" value="36">
-                        Disclosure
+Assault > Weapons testing sandbox
-                </combo_item>
+</combo_item><combo_item name="Copyright_or_intellectual_property_violation" value="37">
-                <combo_item name="Indecency" value="27">
+Copyright or intellectual property violation
-                        Indecency
+</combo_item><combo_item name="Commerce__Failure_to_deliver_product_or_service" value="38">
-                </combo_item>
+Commerce > Failure to deliver product or service
-                <combo_item name="Age" value="28">
+</combo_item><combo_item name="Disclosure__First_Life_information" value="39">
-                        Age
+Disclosure > First life information
-                </combo_item>
+</combo_item><combo_item name="Disclosure__Remotely_monitoring chat" value="40">
-                <combo_item name="Parcel" value="29">
+Disclosure > Remotely monitoring chat
-                        Parcel
+</combo_item><combo_item name="Disclosure__Second_Life_information_chat_IMs" value="41">
-                </combo_item>
+Disclosure > Second Life information/chat/IMs
-                <combo_item name="Other" value="30">
+</combo_item><combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources" value="42">
-                        Other
+Disturbing the peace > Unfair use of region resources
-                </combo_item>
+</combo_item><combo_item name="Disturbing_the_peace__Excessive_scripted_objects" value="43">
+Disturbing the peace > Excessive scripted objects
+</combo_item><combo_item name="Disturbing_the_peace__Object_littering" value="44">
+Disturbing the peace > Object littering
+</combo_item><combo_item name="Disturbing_the_peace__Repetitive_spam" value="45">
+Disturbing the peace > Repetitive spam
+</combo_item><combo_item name="Disturbing_the_peace__Unwanted_advert_spam" value="46">
+Disturbing the peace > Unwanted advert spam
+</combo_item><combo_item name="Fraud__L$" value="47">
+Fraud > L$
+</combo_item><combo_item name="Fraud__Land" value="48">
+Fraud > Land
+</combo_item><combo_item name="Fraud__Pyramid_scheme_or_chain_letter" value="49">
+Fraud > Pyramid scheme or chain letter
+</combo_item><combo_item name="Fraud__US$" value="50">
+Fraud > US$
+</combo_item><combo_item name="Harassment__Advert_farms___visual_spam" value="51">
+Harassment > Advert farms / visual spam
+</combo_item><combo_item name="Harassment__Defaming_individuals_or_groups" value="52">
+Harassment > Defaming individuals or groups
+</combo_item><combo_item name="Harassment__Impeding_movement" value="53">
+Harassment > Impeding movement
+</combo_item><combo_item name="Harassment__Sexual_harassment" value="54">
+Harassment > Sexual harassment
+</combo_item><combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS" value="55">
+Harassment > Solicting/inciting others to violate ToS
+</combo_item><combo_item name="Harassment__Verbal_abuse" value="56">
+Harassment > Verbal abuse
+</combo_item><combo_item name="Indecency__Broadly_offensive_content_or_conduct" value="57">
+Indecency > Broadly offensive content or conduct
+</combo_item><combo_item name="Indecency__Broadly_visible_mature_content" value="58">
+Indecency > Broadly visible mature content
+</combo_item><combo_item name="Indecency__Inappropriate_avatar_name" value="59">
+Indecency > Inappropriate avatar name
+</combo_item><combo_item name="Indecency__Mature_content_in_PG_region" value="60">
+Indecency > Mature content in PG region
+</combo_item><combo_item name="Intolerance" value="61">
+Intolerance
+</combo_item><combo_item name="Land__Abuse_of_sandbox_resources" value="62">
+Land > Abuse of sandbox resources
+</combo_item><combo_item name="Land__Encroachment__Objects_textures" value="63">
+Land > Encroachment > Objects/textures
+</combo_item><combo_item name="Land__Encroachment__Particles" value="64">
+Land > Encroachment > Particles
+</combo_item><combo_item name="Land__Encroachment__Trees_plants" value="65">
+Land > Encroachment > Trees/plants
+</combo_item><combo_item name="Trademark_violation" value="66">
+Trademark violation
+</combo_item><combo_item name="Wagering_gambling" value="67">
+Wagering/gambling
+</combo_item><combo_item name="Other" value="68">
+Other
+</combo_item>
        </combo_box>
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom_delta="-26" drop_shadow_visible="true" follows="left|top"
@@ -125,6 +178,12 @@
             label="Choose Resident" label_selected="" left_delta="190"
             mouse_opaque="true" name="select_abuser"
             tool_tip="Select the name of the abuser from a list" width="160" />
+        <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Don't know abuser's name" left="13" visible="false"
+             mouse_opaque="true" name="omit_abuser_name" width="116" 
+                 tool_tip="Check this if you are unable to provide the abuser's name"/>
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
@@ -173,8 +232,8 @@ if possible.
        </text>
        <button bottom="10" follows="right|bottom" font="SansSerif" halign="center" height="20"
             label="Cancel" label_selected="Cancel" mouse_opaque="true"
-             name="cancel_btn" right="380" width="150" />
+             name="cancel_btn" right="373" width="150" />
        <button bottom="10" follows="right|bottom" font="SansSerif" halign="center" height="20"
             label="Report Abuse" label_selected="Report Abuse" mouse_opaque="true"
-             name="send_btn" right="224" width="150" />
+             name="send_btn" right="217" width="150" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml b/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
index 72d9c35..b83a6df 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
@@ -5,7 +5,7 @@
             embedded_items="false" enabled="true" follows="left|top|right|bottom"
             font="Monospace" height="376" ignore_tab="false" left="4"
             max_length="65536" mouse_opaque="true" name="Script Editor" width="492" border_drop_shadow_visible="false" border_visible="false" bevel_style="none" border_style="line" border_thickness="0"
-             word_wrap="true">
+             word_wrap="true" show_line_numbers="true">
                Loading...
        </text_editor>
        <button bottom="-499" enabled="true" follows="right|bottom" font="SansSerif"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_script_search.xml b/linden/indra/newview/skins/default/xui/en-us/floater_script_search.xml
index 0702674..d8e6cb5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_script_search.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_script_search.xml
@@ -3,7 +3,7 @@
     can_resize="false" can_tear_off="true" enabled="true" height="120"
     left="223" min_height="100" min_width="100" mouse_opaque="true"
     name="script search" title="Script Search" width="300">
-        <check_box bottom="-77" enabled="true" follows="left|top" font="SansSerifSmall"
+        <check_box bottom="-77" control_name="LSLFindCaseInsensitivity" enabled="true" follows="left|top" font="SansSerifSmall"
             height="16" initial_value="false" label="Case Insensitive" left="55"
             mouse_opaque="true" name="case_text" radio_style="false" width="240" />
        <button bottom="-108" enabled="true" font="SansSerif" halign="center" height="24"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_skin_preview_template.xml b/linden/indra/newview/skins/default/xui/en-us/floater_skin_preview_template.xml
index a029f19..f3d5296 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_skin_preview_template.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_skin_preview_template.xml
@@ -64,7 +64,7 @@
             label_width="36" left="5" max_val="1" min_val="0" name="SliderTestName"
             show_text="false" volume="true" width="140" />
            <check_box name="check_box_test_1" label="True" bottom_delta="56" initial_value="true" left="0" />
-        <check_box name="check_box_test_1" label="False" bottom_delta="0" left_delta="50" initial_value="false" />
+        <check_box name="check_box_test_2" label="False" bottom_delta="0" left_delta="50" initial_value="false" />
            <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
                             bottom="8" embedded_items="false" enabled="false"
                              font="SansSerif" height="22" left="2"
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 ce19db8..4ec5e6c 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
@@ -4,18 +4,18 @@
     rect_control="FloaterSnapshotRect" title="Snapshot Preview" width="215">
        <text bottom_delta="-40" follows="top|left" height="15" left="10" name="type_label"
             width="195">
-                What would you like to do?
+    Snapshot destination
-        </text>
+  </text>
        <radio_group bottom_delta="-65" follows="left|top" height="60" label="Snapshot type"
             left="10" name="snapshot_type_radio" width="195">
                <radio_item bottom="-19" height="16" name="postcard">
-                        Send a postcard
+                        Send via email
                </radio_item>
                <radio_item bottom="-38" height="16" name="texture">
-                        Upload a snapshot
+      Save to your inventory (L$10)
-                </radio_item>
+    </radio_item>
                <radio_item bottom="-57" height="16" name="local">
-                        Save snapshot to hard drive
+                        Save to your hard drive
                </radio_item>
        </radio_group>
        <text bottom="-236" follows="left|top" height="25" left="10" name="file_size_label"
@@ -26,10 +26,14 @@
             name="new_snapshot_btn" width="195" />
        <button bottom_delta="-22" follows="left|top" height="20" label="Send" left="10"
             name="send_btn" width="105" />
-        <button bottom_delta="0" follows="left|top" height="20" label="Upload (L$10)" left="10"
+        <button bottom_delta="0" follows="left|top" height="20" label="Save (L$10)" left="10"
             name="upload_btn" width="105" />
-        <button bottom_delta="0" follows="left|top" height="20" label="Save" left="10"
+  <flyout_button bottom_delta="0" follows="left|top" height="20" label="Save" left="10"
-             name="save_btn" width="105" />
+       list_position="below" mouse_opaque="true" name="save_btn" tool_tip="Save image to a file"
+       width="105">
+    <flyout_button_item value="save">Save</flyout_button_item>
+    <flyout_button_item value="save as">Save As...</flyout_button_item>
+  </flyout_button>
        <button bottom_delta="0" follows="left|top" height="20" label="Cancel" left="120"
             name="discard_btn" width="85" />
        <button bottom="-290" follows="left|top" font="SansSerifSmall" halign="center"
@@ -41,11 +45,15 @@
             mouse_opaque="true" name="less_btn" scale_image="TRUE"
             tool_tip="Advanced Options" width="80" />
        <text bottom_delta="-20" follows="top|left" height="15" left="10" name="type_label2"
-             width="195">
+             width="115">
-                What size image do you need?
+        Size
-        </text>
+  </text>
+  <text bottom_delta="0" follows="top|left" height="15" left="130" name="format_label"
+       width="70">
+  Format
+  </text>
        <combo_box bottom_delta="-22" follows="left|top" height="20" label="Resolution" left="10"
-             name="postcard_size_combo" width="195">
+             name="postcard_size_combo" width="115">
                <combo_item name="CurrentWindow" value="[i0,i0]">
                        Current Window
                </combo_item>
@@ -63,7 +71,7 @@
                </combo_item>
        </combo_box>
        <combo_box bottom_delta="0" follows="left|top" height="20" label="Resolution" left="10"
-             name="texture_size_combo" width="195">
+             name="texture_size_combo" width="115">
                <combo_item name="CurrentWindow" value="[i0,i0]">
                        Current Window
                </combo_item>
@@ -81,7 +89,7 @@
                </combo_item>
        </combo_box>
        <combo_box bottom_delta="0" follows="left|top" height="20" label="Resolution" left="10"
-             name="local_size_combo" width="195">
+             name="local_size_combo" width="115">
                <combo_item name="CurrentWindow" value="[i0,i0]">
                        Current Window
                </combo_item>
@@ -107,12 +115,25 @@
                        Custom
                </combo_item>
        </combo_box>
+        <combo_box bottom_delta="0" follows="left|top" height="20" label="Format" left="130"
+             name="local_format_combo" width="70">
+                <combo_item name="PNG">
+                        PNG
+                </combo_item>
+                <combo_item name="JPEG">
+                        JPEG
+                </combo_item>
+                <combo_item name="BMP">
+                        BMP
+                </combo_item>
+        </combo_box>
        <spinner bottom_delta="-25" decimal_digits="0" follows="left|top" height="20"
             increment="32" label="Width" label_width="30" left="10" max_val="6016"
-             min_val="32" name="snapshot_width" width="95" />
+             min_val="32" name="snapshot_width" width="95" allow_text_entry="false"/>
        <spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="20"
             increment="32" label="Height" label_width="35" left="110" max_val="6016"
-             min_val="32" name="snapshot_height" width="95" />
+             min_val="32" name="snapshot_height" width="95" allow_text_entry="false"/>
        <check_box bottom_delta="-20" follows="left|top" label="Constrain Proportions" left="10"
             name="keep_aspect_check" />
        <slider bottom_delta="-20" decimal_digits="0" follows="left|top" height="15"
@@ -148,3 +169,4 @@
                unknown
        </string>
 </floater>
+ 
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 db176b3..7f2ce76 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
@@ -3,7 +3,7 @@
     can_resize="false" follows="left|top" height="550" 
     left="308" min_height="100" min_width="100" mouse_opaque="true"
     name="toolbox floater" rect_control="ToolboxRect" sound_flags="0" title=""
-     width="272">
+     short_title="Build" width="272">
 <!-- Main floater tabs -->
@@ -278,7 +278,16 @@
                        Large
                </combo_item>
        </combo_box>
-        <button bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="center"
+        <volume_slider bottom_delta="-19" follows="left|top" height="16" hidden="false" increment="0.1"
+         initial_val="0.00" left="176" max_val="2.0" min_val="-1.0"
+             mouse_opaque="true" name="slider force" width="70" />      
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="4" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             left="126" mouse_opaque="true" name="Strength:" v_pad="0" width="128">
+                  Strength:
+        </text>    
+        <button bottom_delta="-22" follows="left|top" font="SansSerifSmall" halign="center"
             height="16" label="Apply to selection" label_selected="Apply to selection"
             left="118" mouse_opaque="true" name="button apply to selection"
             scale_image="TRUE" tool_tip="Modify Selected Land" width="134" />
@@ -417,13 +426,13 @@
                             name="checkbox for sale" width="78" />
                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="100"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="90"
-                             mouse_opaque="true" name="Price:  L$" v_pad="0" width="56">
+                             mouse_opaque="true" name="Cost" v_pad="0" width="78">
                                Price:  L$
                        </text>
                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-                             follows="left|top|right" font="SansSerifSmall" height="16" left_delta="56"
+                             follows="left|top|right" font="SansSerifSmall" height="16" left_delta="80"
-                             max_length="25" mouse_opaque="true" name="EdCost" width="84" />
+                             max_length="25" mouse_opaque="true" name="Edit Cost" width="75" />
                        <radio_group bottom="-286" draw_border="false" follows="left|top|right" height="16"
                             left="42" mouse_opaque="true" name="sale type" width="218">
                                <radio_item bottom="-16" follows="left|top" height="16" left="0" mouse_opaque="true"
@@ -537,6 +546,21 @@
                        <string name="text modify warning">
                                Must select entire object to set permissions.
                        </string>
+                        <string name="Cost Default">
+                        Price:           L$
+                        </string>
+                        <string name="Cost Total">
+                        Total Price:  L$
+                        </string>
+                        <string name="Cost Per Unit">
+                        Price Per:     L$
+                        </string>
+                        <string name="Cost Mixed">
+                        Mixed Price
+                        </string>
+                        <string name="Sale Mixed">
+                        Mixed Sale
+                        </string>
                </panel>
 <!-- Object sub-tab -->
@@ -843,6 +867,16 @@
                             label="Sculpt Texture" left="121" mouse_opaque="true"
                             name="sculpt texture control" tool_tip="Click to choose a picture"
                             visible="false" width="141" />
+            <check_box bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="16"
+                 initial_value="false" label="Mirror" left="121" mouse_opaque="true"
+                 name="sculpt mirror control" visible="false"
+                 tool_tip="Flips sculpted prim along the X axis."
+                 width="121" />
+            <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+                 initial_value="false" label="Inside-out" left="121" mouse_opaque="true"
+                 name="sculpt invert control" visible="false"
+                 tool_tip="Inverts the sculpted prims normals, making it appear inside-out."
+                 width="121" />
                        <text align="left" 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" height="10" left="121"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml b/linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml
index 2003548..2108b42 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml
@@ -1,18 +1,19 @@
 <?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="350" min_height="300" min_width="450" name="top_objects"
-     title="loading..." width="450">
+     title="loading..." width="550">
        <text bottom="-50" follows="left|top" font="SansSerif" height="20" left="10"
             name="title_text" width="400">
                Loading...
        </text>
        <scroll_list bottom_delta="-150" draw_border="true" draw_heading="true"
             follows="left|top|bottom|right" height="150" left="10" multi_select="true"
-             name="objects_list" width="430">
+             name="objects_list" width="530">
                <column label="Score" name="score" width="55" />
                <column dynamicwidth="true" label="Name" name="name" />
                <column label="Owner" name="owner" width="105" />
                <column label="Location" name="location" width="130" />
+                <column label="Time" name="time" width="180" />
        </scroll_list>
        <text bottom_delta="-30" follows="left|bottom" font="SansSerifSmall" height="20"
             left="10" name="id_text" width="100">
@@ -20,7 +21,7 @@
        </text>
        <line_editor bottom_delta="3" enabled="false"
             follows="left|bottom|right" font="SansSerifSmall" height="20" left="80"
-             name="id_editor" width="250" />
+             name="id_editor" width="350" />
        <button bottom_delta="0" follows="bottom|right" height="20" label="Show Beacon"
             name="show_beacon_btn" right="-10" width="100" />
        <text bottom_delta="-30" follows="left|bottom" font="SansSerifSmall" height="20"
@@ -29,7 +30,7 @@
        </text>
        <line_editor bottom_delta="3" enabled="true"
             follows="left|bottom|right" font="SansSerifSmall" height="20" left="80"
-             name="object_name_editor" width="250" />
+             name="object_name_editor" width="350" />
        <button bottom_delta="0" follows="bottom|right" height="20" label="Filter"
             name="filter_object_btn" right="-10" width="100" />
        <text bottom_delta="-30" follows="left|bottom" font="SansSerifSmall" height="20"
@@ -38,7 +39,7 @@
        </text>
        <line_editor bottom_delta="3" enabled="true"
             follows="left|bottom|right" font="SansSerifSmall" height="20" left="80"
-             name="owner_name_editor" width="250" />
+             name="owner_name_editor" width="350" />
        <button bottom_delta="0" follows="bottom|right" height="20" label="Filter"
             name="filter_owner_btn" right="-10" width="100" />
        <button bottom="35" follows="bottom|left" height="20" label="Return Selected" left="10"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tos.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tos.xml
index 68ddae0..f1bec32 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tos.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tos.xml
@@ -3,31 +3,17 @@
     can_resize="false" height="500" min_height="100" min_width="100"
     name="modal container" title="" width="600">
        <button bottom="-484" enabled="false" font="SansSerif" halign="center" height="20"
-             label="Continue" label_selected="Continue" left="376" mouse_opaque="true"
+             label="Continue" label_selected="Continue" left="484" mouse_opaque="true"
             name="Continue" width="100" />
        <button bottom="-484" font="SansSerif" halign="center" height="20" label="Cancel"
-             label_selected="Cancel" left_delta="108" mouse_opaque="true" name="Cancel"
+             label_selected="Cancel" left="16" mouse_opaque="true" name="Cancel"
             width="100" />
-        <radio_group bottom="-440" draw_border="false" follows="left|top|right" height="40"
+        <check_box bottom="-435" follows="top|right"
-             left="16" mouse_opaque="true" name="tos_agreement" width="568">
+                font="SansSerifSmall" height="16" initial_value="false" label="I Agree to the Terms of Service"
-                <radio_item bottom="-16" follows="left|top" height="16" left="0" mouse_opaque="true"
+                left="16" mouse_opaque="true" name="agree_chk" width="55" />
-                     name="radio_disagree" width="187">
-                        I Disagree with the Terms of Service
-                </radio_item>
-                <radio_item bottom="-40" follows="left|top" height="16" left="0" mouse_opaque="true"
-                     name="radio_agree" width="216">
-                        I Agree to the Terms of Service
-                </radio_item>
-        </radio_group>
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-31" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+             bottom="-50" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-             h_pad="0" halign="left" height="15" left="16" mouse_opaque="true"
+             h_pad="0" halign="left" height="30" left="16" mouse_opaque="true"
-             name="tos_title" v_pad="0" width="568">
-                Terms of Service Agreement
-        </text>
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-77" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-             h_pad="0" halign="left" height="30" left="32" mouse_opaque="true"
             name="tos_heading" v_pad="0" width="552">
                Please read the following Terms of Service carefully. To continue logging in to Second Life,
 you must accept the agreement.
@@ -38,8 +24,8 @@ you must accept the agreement.
             word_wrap="true">
                TOS_TEXT
        </text_editor>
-        <web_browser bottom="-376" embedded_items="false" follows="left|top" font="SansSerif"
+        <web_browser bottom="-406" embedded_items="false" follows="left|top" font="SansSerif"
-             height="283" left="16" max_length="65536" mouse_opaque="true"
+             height="340" left="16" max_length="65536" mouse_opaque="true"
             name="tos_html"
             start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E"
             width="568" word_wrap="true" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml
index 0ebab6f..059e8fb 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml
@@ -49,88 +49,76 @@
             height="16" label="Go Home" label_selected="Go Home" left_delta="57"
             mouse_opaque="true" name="Go Home" tool_tip="Teleport to your home"
             width="88" />
-        <icon bottom="-76" color="1, 1, 1, 1" follows="top|right" height="16"
+        <icon bottom="-82" color="0, 1, 0, 1" follows="top|right" height="8"
-             image_name="icon_top_pick.tga" left="1013" mouse_opaque="true"
+                image_name="map_avatar_8.tga" left="1017" mouse_opaque="true" name="person"
-             name="classifieds" width="16" />
+                width="8" />
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-76" drop_shadow_visible="true" follows="top|right"
+                bottom="-86" drop_shadow_visible="true" follows="top|right"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
+                font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="16"
-             mouse_opaque="true" name="classifieds_label" v_pad="0" width="145">
+                mouse_opaque="true" name="person_label" v_pad="0" width="145">
-                Classifieds
-        </text>
-        <check_box bottom="-76" control_name="MapShowClassifieds" follows="top|right"
-             font="SansSerifSmall" height="16" initial_value="false" label=" "
-             left_delta="70" mouse_opaque="true" name="class_chk" width="55" />
-        <icon bottom="-92" color="0, 1, 0, 1" follows="top|right" height="8"
-             image_name="map_avatar_8.tga" left="1017" mouse_opaque="true" name="person"
-             width="8" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-96" drop_shadow_visible="true" follows="top|right"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="16"
-             mouse_opaque="true" name="person_label" v_pad="0" width="145">
                Person
        </text>
-        <check_box bottom="-96" control_name="MapShowPeople" follows="top|right"
+        <check_box bottom="-86" control_name="MapShowPeople" follows="top|right"
-             font="SansSerifSmall" height="16" initial_value="false" label=" "
+                font="SansSerifSmall" height="16" initial_value="false" label=" "
-             left_delta="70" mouse_opaque="true" name="people_chk" width="55" />
+                left_delta="70" mouse_opaque="true" name="people_chk" width="55" />
-        <icon bottom="-116" color="1, 1, 1, 1" follows="top|right" height="16"
+        <icon bottom="-106" color="1, 1, 1, 1" follows="top|right" height="16"
-             image_name="map_infohub.tga" left="1013" mouse_opaque="true" name="infohub"
+                image_name="map_infohub.tga" left="1013" mouse_opaque="true" name="infohub"
-             width="16" />
+                width="16" />
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-116" drop_shadow_visible="true" follows="top|right"
+                bottom="-106" drop_shadow_visible="true" follows="top|right"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
+                font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
-             mouse_opaque="true" name="infohub_label" v_pad="0" width="145">
+                mouse_opaque="true" name="infohub_label" v_pad="0" width="145">
                Infohub
        </text>
-        <check_box bottom="-116" control_name="MapShowInfohubs" follows="top|right"
+        <check_box bottom="-106" control_name="MapShowInfohubs" follows="top|right"
-             font="SansSerifSmall" height="16" initial_value="false" label=""
+                font="SansSerifSmall" height="16" initial_value="false" label=""
-             left_delta="70" mouse_opaque="true" name="infohub_chk" width="55" />
+                left_delta="70" mouse_opaque="true" name="infohub_chk" width="55" />
-        <icon bottom="-136" color="1, 1, 1, 1" follows="top|right" height="16"
+        <icon bottom="-126" color="1, 1, 1, 1" follows="top|right" height="16"
-             image_name="map_telehub.tga" left="1013" mouse_opaque="true" name="telehub"
+                image_name="map_telehub.tga" left="1013" mouse_opaque="true" name="telehub"
-             width="16" />
+                width="16" />
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-136" drop_shadow_visible="true" follows="top|right"
+                bottom="-126" drop_shadow_visible="true" follows="top|right"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
+                font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
-             mouse_opaque="true" name="telehub_label" v_pad="0" width="145">
+                mouse_opaque="true" name="telehub_label" v_pad="0" width="145">
                Telehub
        </text>
-        <check_box bottom="-136" control_name="MapShowTelehubs" follows="top|right"
+        <check_box bottom="-126" control_name="MapShowTelehubs" follows="top|right"
-             font="SansSerifSmall" height="16" initial_value="false" label=""
+                font="SansSerifSmall" height="16" initial_value="false" label=""
-             left_delta="70" mouse_opaque="true" name="telehubchk" width="55" />
+                left_delta="70" mouse_opaque="true" name="telehubchk" width="55" />
-        <icon bottom="-76" color="1, 1, 1, 1" follows="top|right" height="16"
+        <icon bottom="-86" color="1, 1, 1, 1" follows="top|right" height="16"
             image_name="icon_for_sale.tga" left="1123" mouse_opaque="true"
             name="landforsale" width="16" />
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-76" drop_shadow_visible="true" follows="top|right"
+             bottom="-86" drop_shadow_visible="true" follows="top|right"
             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
             mouse_opaque="true" name="land_for_sale_label2" v_pad="0" width="145">
                Land For Sale
        </text>
-        <check_box bottom="-76" control_name="MapShowLandForSale" follows="top|right"
+        <check_box bottom="-86" control_name="MapShowLandForSale" follows="top|right"
             font="SansSerifSmall" height="16" initial_value="false" label=""
             left_delta="80" mouse_opaque="true" name="land_for_sale_chk" width="55" />
-        <icon bottom="-96" color="1, 1, 1, 1" follows="top|right" height="16"
+        <icon bottom="-106" color="1, 1, 1, 1" follows="top|right" height="16"
             image_name="map_event.tga" left="1123" mouse_opaque="true" name="event"
             width="16" />
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-96" drop_shadow_visible="true" follows="top|right"
+             bottom="-106" drop_shadow_visible="true" follows="top|right"
             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
             mouse_opaque="true" name="events_label" v_pad="0" width="145">
                Events
        </text>
-        <check_box bottom="-96" control_name="MapShowEvents" follows="top|right"
+        <check_box bottom="-106" control_name="MapShowEvents" follows="top|right"
             font="SansSerifSmall" height="16" initial_value="false" label=""
             left_delta="80" mouse_opaque="true" name="event_chk" width="55" />
-        <icon bottom="-116" color="1, 1, 1, 1" follows="top|right" height="16"
+        <icon bottom="-126" color="1, 1, 1, 1" follows="top|right" height="16"
             image_name="map_event_mature.tga" left="1123" mouse_opaque="true"
             name="events_mature_icon" width="16" />
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-116" drop_shadow_visible="true" follows="top|right"
+             bottom="-126" drop_shadow_visible="true" follows="top|right"
             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
             mouse_opaque="true" name="events_mature_label" v_pad="0" width="145">
                Events (M)
        </text>
-        <check_box bottom="-116" control_name="ShowMatureEvents" follows="top|right"
+        <check_box bottom="-126" control_name="ShowMatureEvents" follows="top|right"
             font="SansSerifSmall" height="16" initial_value="true" label=""
             left_delta="80" mouse_opaque="true" name="event_mature_chk" width="55" />
        <icon bottom="-181" color="0.5, 0, 0, 1" follows="top|right" height="16"
@@ -147,7 +135,7 @@
             image_name="map_track_16.tga" left="1013" mouse_opaque="true"
             name="landmark_icon" width="16" />
        <combo_box allow_text_entry="true" bottom_delta="0" follows="top|right" height="20"
-             label="Landmarks" left_delta="20" max_chars="60" mouse_opaque="true"
+             label="Landmarks" left_delta="20" max_chars="64" mouse_opaque="true"
             name="landmark combo" tool_tip="Landmark to Show on Map" width="202">
                <combo_item name="none_selected" value="None">
                        Landmarks
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
index b224954..c8d8ed6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
@@ -11,7 +11,7 @@
                <on_click function="GoToObject" />
        </menu_item_call>
        <menu_item_separator />
-        <menu_item_call enabled="false" label="Add Friend" mouse_opaque="true" name="Add Friend">
+        <menu_item_call enabled="false" label="Add Friend..." mouse_opaque="true" name="Add Friend">
                <on_click function="Avatar.AddFriend" />
                <on_enable function="Avatar.EnableAddFriend" />
        </menu_item_call>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml
index 72fca5e..327e22e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml
@@ -87,5 +87,6 @@
        </pie_menu>
        <menu_item_call enabled="true" label="Appearance..." name="Appearance...">
                <on_click function="ShowFloater" userdata="appearance" />
+                <on_enable function="Edit.EnableCustomizeAvatar" />
        </menu_item_call>
 </pie_menu>
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 054f867..bbe9fbd 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
@@ -357,7 +357,7 @@
                        <on_check function="View.CheckHighlightTransparent" />
                </menu_item_check>
                <menu_item_check bottom="-384" enabled="true" height="19" label="Beacons Always On" left="0"
-                     mouse_opaque="true" name="Beacons Always On" shortcut="control|N"
+                     mouse_opaque="true" name="Beacons Always On"
                     width="211">
                        <on_click function="ToggleControl" userdata="BeaconAlwaysOn" />
                        <on_check control="BeaconAlwaysOn" />
@@ -518,7 +518,12 @@
                     mouse_opaque="true" name="Stop All Animations" width="250">
                        <on_click function="Tools.StopAllAnimations" userdata="" />
                </menu_item_call>
-                <menu_item_separator bottom="-213" enabled="true" height="8" label="-----------" left="0"
+                <menu_item_call bottom="-213" enabled="false" height="19" label="Release Keys" left="0"
+                     mouse_opaque="true" name="Release Keys" width="250">
+                        <on_click function="Tools.ReleaseKeys" userdata="" />
+                        <on_enable function="Tools.EnableReleaseKeys" userdata="" />
+                </menu_item_call>
+                <menu_item_separator bottom="-232" enabled="true" height="8" label="-----------" left="0"
                     mouse_opaque="true" name="separator4" width="185" />
                <menu_item_call bottom="-232" enabled="true" height="19" label="Account History..." left="0"
                     mouse_opaque="true" name="Account History..." width="185">
@@ -732,12 +737,22 @@
                     name="Show Script Warning/Error Window" width="250">
                        <on_click function="ShowFloater" userdata="script errors" />
                </menu_item_call>
-                <menu_item_call bottom="-449" enabled="false" height="19"
+                <menu bottom="-449" color="0 0 0 1" drop_shadow="true" enabled="true" height="52"
-                     label="Recompile Scripts in Selection" left="0" mouse_opaque="true"
+                     hidden="false" label="Recompile Scripts in Selection" left="0" mouse_opaque="false"
-                     name="Recompile Scripts in Selection" width="250">
+                     name="Recompile Scripts in Selection" opaque="true" tear_off="true" create_jump_keys="true" width="169">
-                        <on_click function="Tools.SelectedScriptAction" userdata="compile" />
+                     <menu_item_call bottom="-29" enabled="true" height="19" 
-                        <on_enable function="EditableSelected" />
+                             hidden="false" label="Mono" left="0"
-                </menu_item_call>
+                             mouse_opaque="true" name="Mono" width="169">
+                             <on_click function="Tools.SelectedScriptAction" userdata="compile mono" />
+                             <on_enable function="EditableSelectedMono" />
+                     </menu_item_call>
+                     <menu_item_call bottom="-48" enabled="true" height="19" 
+                             hidden="false" label="LSL" left="0"
+                             mouse_opaque="true" name="LSL" width="169">
+                             <on_click function="Tools.SelectedScriptAction" userdata="compile lsl" />
+                             <on_enable function="EditableSelected" />
+                     </menu_item_call>
+                </menu>
                <menu_item_call bottom="-468" enabled="false" height="19" label="Reset Scripts in Selection"
                     left="0" mouse_opaque="true" name="Reset Scripts in Selection" width="250">
                        <on_click function="Tools.SelectedScriptAction" userdata="reset" />
@@ -840,14 +855,6 @@
                                     userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
                        </menu_item_call>
                </menu>
-                <menu_item_separator bottom="-221" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator5" width="166" />
-                <menu_item_call bottom="-121" enabled="true" height="19" label="Release Notes..." left="0"
-                     mouse_opaque="true" name="Release Notes..." width="166">
-                        <on_click function="PromptShowFile" userdata="WebLaunchReleaseNotes,releasenotes.txt" />
-                </menu_item_call>
-                <menu_item_separator bottom="-294" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator6" width="166" />
                <menu_item_call bottom="-313" enabled="true" height="19" label="About Second Life..." left="0"
                     mouse_opaque="true" name="About Second Life..." width="166">
                        <on_click function="ShowFloater" userdata="about" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types.xml
index e2e6fb2..e3d1021 100644
--- a/linden/indra/newview/skins/default/xui/en-us/mime_types.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/mime_types.xml
@@ -224,6 +224,14 @@
                        image
                </widgettype>
        </mimetype>
+        <mimetype name="application/smil">
+                <label name="application/smil_label">
+                    Synchronized Multimedia Integration Language (SMIL)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+        </mimetype>
        <mimetype name="application/xhtml+xml">
                <label name="application/xhtml+xml_label">
                        Web Page (XHTML)
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 02aa57c..60f70b2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notify.xml
@@ -168,11 +168,6 @@ again in a minute.
                        You have offered a calling card to [FIRST] [LAST]
                </message>
        </notify>
-        <notify name="OfferedFriendship" tip="true">
-                <message name="message">
-                        You have offered friendship to [FIRST] [LAST]
-                </message>
-        </notify>
        <notify name="UnableToBuyWhileDownloading" tip="true">
                <message name="message">
                        Unable to buy while downloading object data.
@@ -573,9 +568,24 @@ to his or her location:
        <notify name="OfferFriendship" tip="false">
                <message name="message">
                        [NAME] is offering friendship.
-      
+ 
-      By default, you will be able to 
+[MESSAGE]
-see each other&apos;s online status.
+ 
+(By default, you will be able to see each other&apos;s online status.)
+                </message>
+                <option name="Accept">
+                        Accept
+                </option>
+                <option name="Decline">
+                        Decline
+                </option>
+        </notify>
+        <notify name="OfferFriendshipNoMessage" tip="false">
+                <message name="message">
+                        [NAME] is offering friendship.
+(By default, you will be able to 
+see each other&apos;s online status.)
                </message>
                <option name="Accept">
                        Accept
@@ -636,14 +646,20 @@ From object: [OBJECTNAME], owner: [NAME]?
        </notify>
        <notify name="FailedToLoadWearableUnnamed" tip="false">
                <message name="message">
-                        Failed to load [TYPE].
+                        Oops!
-Please notify the vendor from whom you purchased this item.
+You tried to wear a [TYPE] and it did not load.
+Don't panic.
+Try again in a minute to give things a chance to settle down.
                </message>
        </notify>
        <notify name="FailedToLoadWearable" tip="false">
                <message name="message">
-                        Failed to load [TYPE] named [DESC].
+                        Oops!
-Please notify the vendor from whom you purchased this item.
+You tried to wear [TYPE] named [DESC] and it did not load.
+Don't panic.
+Try again in a minute to give things a chance to settle down.
                </message>
        </notify>
        <notify name="FailedToFindWearableUnnamed" tip="false">
@@ -828,9 +844,9 @@ Right-click always shows a menu of things you can do.
        </notify>
        <notify name="FirstTeleport" tip="false">
                <message name="message">
-                        You have just teleported. 
+                        This region doesn't allow point-to-point teleports, so you've been transported to the nearest telehub. 
-You are at the Infohub nearest your destination.
+Your destination is marked with a tall beacon. 
-Your destination is marked with a tall red beacon.
+Follow the red arrow to the beacon, or click the arrow to dismiss the beacon.
                </message>
        </notify>
        <notify name="FirstOverrideKeys" tip="false">
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 fa7f420..5a2a774 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
@@ -182,32 +182,27 @@
                             width="130" />
                </panel>
                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
-                     label="Web" left="1" mouse_opaque="true" name="WebProfile" width="418">
+                       label="Web" left="1" mouse_opaque="true" name="WebProfile" width="418">
-                        <button bottom_delta="-22" follows="left|top" font="SansSerifSmall" halign="center"
+                  <line_editor bevel_style="in" border_style="line"
-                             height="18" label="Home" label_selected="Home" left="10"
+                             border_thickness="1" bottom_delta="-18" enabled="false" follows="left|top"
-                             mouse_opaque="true" name="home" width="55" />
+                             font="SansSerifSmall" height="16" is_unicode="false" left="10"
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
+                             max_length="254" mouse_opaque="true" name="url_edit"
-                             height="18" label="Load" label_selected="Load" left_delta="60"
+                             width="400" />
-                             mouse_opaque="true" name="load"
+      <flyout_button bottom_delta="-22" follows="left|top" font="SansSerifSmall" halign="center"
-                             tool_tip="Load this profile page with embedded web browser." width="60" />
+                             height="18" label="Load" label_selected="Load" left="10"
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
+                             mouse_opaque="true" name="load" enabled="false" 
-                             height="18" label="Open..." label_selected="Open..." left_delta="63"
+                             tool_tip="Load this profile page with embedded web browser." width="80" >
-                             mouse_opaque="true" name="open"
+        <flyout_button_item value="open">In external browser</flyout_button_item>
-                             tool_tip="Open this profile page in your default external web browser."
+        <flyout_button_item value="home">Home URL</flyout_button_item>
-                             width="60" />
+      </flyout_button>
                        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-                             height="18" label="?" label_selected="?" left_delta="65"
+                             height="18" label="?" label_selected="?" left_delta="85"
                             mouse_opaque="true" name="web_profile_help" width="18" />
                        <check_box bottom_delta="0" follows="right|top" font="SansSerifSmall" height="16"
                             initial_value="false" label="Automatically load web profiles"
                             left_delta="30" mouse_opaque="true" name="auto_load"
                             tool_tip="Automatically load ALL profile webpages without asking first."
                             width="127" />
-                        <line_editor bevel_style="in" border_style="line"
-                             border_thickness="1" bottom_delta="-18" enabled="false" follows="left|top"
-                             font="SansSerifSmall" height="16" is_unicode="false" left="10"
-                             max_length="254" mouse_opaque="true" name="url_edit"
-                             width="400" />
                        <web_browser border_visible="false" bottom="-444" follows="top|left|right" height="400"
                             ignore_ui_scale="false" left="10" name="profile_html" start_url=""
                             width="400" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_land_covenant.xml b/linden/indra/newview/skins/default/xui/en-us/panel_land_covenant.xml
index 3d5ee66..e9f8f3a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_land_covenant.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_land_covenant.xml
@@ -46,7 +46,7 @@
             max_length="65535" name="covenant_editor" 
             width="425" word_wrap="true" />
        <string name="can_resell">
-                string land in this region may be resold.
+                Purchased land in this region may be resold.
        </string>
        <string name="can_not_resell">
                Purchased land in this region may not be resold.
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
index 8378eb2..2122ee7 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
@@ -63,35 +63,33 @@
        </combo_box>
        <check_box bottom="10" follows="left|bottom" font="SansSerifSmall" height="16"
             initial_value="false" label="Remember password"
-             left_delta="165" mouse_opaque="true" name="remember_check" width="138" />
+             left_delta="163" mouse_opaque="true" name="remember_check" width="138" />
        <button bottom="28" follows="left|bottom" font="SansSerif" halign="center"
-             height="24" label="Connect" label_selected="Connect"
+             height="24" label="Log In" label_selected="Log In"
-             left="440" mouse_opaque="true" name="connect_btn" scale_image="TRUE"
+             left="435" mouse_opaque="true" name="connect_btn" scale_image="TRUE"
             width="120" />
-        <button bottom="28" follows="left|bottom" font="SansSerif" halign="center"
-             height="24" label="Quit" label_selected="Quit" left="572"
-             mouse_opaque="true" name="quit_btn" scale_image="TRUE" width="120" />
        <combo_box allow_text_entry="true" bottom="32" follows="left|bottom" height="18"
             left_delta="135" max_chars="20" mouse_opaque="true"
             name="server_combo" width="120" />
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="42" drop_shadow_visible="true" follows="right|bottom"
+             bottom="45" drop_shadow_visible="true" follows="right|bottom"
-             font="SansSerifSmall" h_pad="0" halign="right" height="12"
+             font="SansSerifSmall" font-style="UNDERLINE" h_pad="0" halign="right" height="16"
-             left="-210" mouse_opaque="true" name="channel_text" v_pad="0" width="200"
+             left="-210" mouse_opaque="true" name="create_new_account_text" v_pad="0" width="200"
-             hover="true">
+             hover="true" hover_color="50 115 185">
-                [Viewer Channel Name]
+                Sign up for account
        </text>
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="30" drop_shadow_visible="true" follows="right|bottom"
+             bottom="25" drop_shadow_visible="true" follows="right|bottom"
-             font="SansSerifSmall" h_pad="0" halign="right" height="12"
+             font="SansSerifSmall" font-style="UNDERLINE" h_pad="0" halign="right" height="16"
-             left="-110" mouse_opaque="true" name="version_text" v_pad="0" width="100"
+             left="-210" mouse_opaque="true" name="forgot_password_text" v_pad="0" width="200"
-             hover="true">
+             hover="true" hover_color="50 115 185">
-                1.23.4 (5)
+                Forgot your name or password?
        </text>
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="7" drop_shadow_visible="true" follows="left|bottom"
+             bottom="5" drop_shadow_visible="true" follows="right|bottom"
-             font="SansSerifSmall" font-style="SHADOW" h_pad="0" halign="right" height="16"
+             font="SansSerifSmall" h_pad="0" halign="right" height="16"
-             left="440" mouse_opaque="true" name="forgot_password_text" v_pad="0" width="170"
+             left="-310" mouse_opaque="true" name="channel_text" v_pad="0" width="300"
-             hover="true" hover_color="50 115 185">Forgot your name or password?
+             hover="true" hover_color="50 115 185">
+                [CHANNEL] [VERSION]
        </text>
 </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 bcd7bbc..926e3d8 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
@@ -27,11 +27,6 @@
                                             tool_tip="Chat and IM is hidden for you. Click here to set yourself not busy."
                                             width="102" />
                                        <button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
-                                             label="Release Keys" label_selected="Release Keys" left="229"
-                                             name="Release Keys" scale_image="true"
-                                             tool_tip="A script has taken control of your keys. Click here to release them."
-                                             width="102" />
-                                        <button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
                                             label="Mouselook" label_selected="Mouselook" left="343" name="Mouselook"
                                             scale_image="true"
                                             tool_tip="Use mouse to steer your view. If you have a gun, clicking will shoot."
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_LCD.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_LCD.xml
deleted file mode 100644
index 2cc8b13..0000000
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_LCD.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" label="Logitech LCD" left="102" mouse_opaque="true"
-     name="LCD Options" width="517">
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-             mouse_opaque="true" name="LCD Destination:" v_pad="0" width="266">
-                LCD Destination:
-        </text>
-        <radio_group bottom="-45" control_name="LCDDestination" draw_border="true" enabled="true"
-             follows="left|top" height="36" left="148" mouse_opaque="true"
-             name="LCDDestination" width="193">
-                <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" left="3"
-                     mouse_opaque="true" name="DestinationG15"
-                     tool_tip="Display forms selected appear on Logitech G15 Keyboard LCD"
-                     width="463">
-                        Logitech G15 Gaming Keyboard
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16" left="3"
-                     mouse_opaque="true" name="DestinationZ10"
-                     tool_tip="Display forms selected appear on Logitech Z10 Speaker LCD"
-                     width="463">
-                        Logitech Z10 Speakers
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-68" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-             mouse_opaque="true" name="LCD Display Options" v_pad="0" width="266">
-                LCD Display Options:
-        </text>
-        <check_box bottom="-72" control_name="DisplayChat" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" label="Display Chat" left="148"
-             mouse_opaque="true" name="DisplayChat" radio_style="false"
-             tool_tip="Display Last Chat line in LCD Window" width="128" />
-        <check_box bottom="-90" control_name="DisplayIM" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Display IM&apos;s" left="148" mouse_opaque="true" name="DisplayIM"
-             radio_style="false" tool_tip="Display Last IM in LCD Window" width="242" />
-        <check_box bottom="-108" control_name="DisplayRegion" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Show Location Information" left="148" mouse_opaque="true"
-             name="DisplayRegion" radio_style="false"
-             tool_tip="Display current location information in LCD Window" width="201" />
-        <check_box bottom="-126" control_name="DisplayLinden" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Show Account Information" left="148" mouse_opaque="true"
-             name="DisplayLinden" radio_style="false"
-             tool_tip="Display current account information in LCD Window" width="201" />
-        <check_box bottom="-144" control_name="DisplayDebug" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Display Network Comms Info" left="148" mouse_opaque="true"
-             name="DisplayDebug" radio_style="false"
-             tool_tip="Display debug information in LCD Window" width="242" />
-        <check_box bottom="-162" control_name="DisplayDebugConsole" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Display Debug Info from Console" left="148" mouse_opaque="true"
-             name="DisplayDebugConsole" radio_style="false"
-             tool_tip="Display console debug information in LCD Window" width="242" />
-</panel>
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 27ec29a..b2bb65f 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
@@ -8,67 +8,87 @@
             mouse_opaque="false" name="text_box" v_pad="0" width="128">
                Chat Font Size:
        </text>
-        <radio_group bottom="-72" control_name="ChatFontSize" draw_border="true" enabled="true"
+        <radio_group bottom="-40" control_name="ChatFontSize" draw_border="true" enabled="true"
-             follows="left|top" height="60" left="148" mouse_opaque="true"
+             follows="left|top" height="30" left="148" mouse_opaque="true"
-             name="chat font size" width="128">
+             name="chat font size" width="331">
-                <radio_item type="string" length="1" bottom="-20" enabled="true" height="16" left="0" mouse_opaque="true"
+                <radio_item type="string" length="1" bottom="-24" enabled="true" height="16" left="0" mouse_opaque="true"
                     name="radio" width="98">
                        Small
                </radio_item>
-                <radio_item type="string" length="1" bottom="-40" enabled="true" height="16" left="0" mouse_opaque="true"
+                <radio_item type="string" length="1" bottom="-24" enabled="true" height="16" left="110" mouse_opaque="true"
                     name="radio2" width="98">
                        Medium
                </radio_item>
-                <radio_item type="string" length="1" bottom="-60" enabled="true" height="16" left="0" mouse_opaque="true"
+                <radio_item type="string" length="1" bottom="-24" enabled="true" height="16" left="220" mouse_opaque="true"
                     name="radio3" width="98">
                        Large
                </radio_item>
        </radio_group>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-95" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-64" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
             mouse_opaque="false" name="text_box2" v_pad="0" width="128">
                Chat Color:
        </text>
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
+             can_apply_immediately="true" color="1 1 1 1" control_name="UserChatColor"
+             enabled="true" follows="left|top" height="56" label="You" left="148"
+             mouse_opaque="true" name="user" width="44" />
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
             can_apply_immediately="true" color="1 1 1 1" control_name="AgentChatColor"
-             enabled="true" follows="left|top" height="56" label="Chat" left="148"
+             enabled="true" follows="left|top" height="56" label="Others" left_delta="48"
-             mouse_opaque="true" name="users" width="44" />
+             mouse_opaque="true" name="agent" width="44" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
             can_apply_immediately="true" color="0.6 0.6 1 1" control_name="IMChatColor"
             enabled="true" follows="left|top" height="56" label="IM" left_delta="48"
             mouse_opaque="true" name="im" width="44" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
             can_apply_immediately="true" color="0.8 1 1 1"
             control_name="SystemChatColor" enabled="true" follows="left|top"
             height="56" label="System" left_delta="48" mouse_opaque="true"
             name="system" width="44" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
+             can_apply_immediately="true" color="0.82 0.82 0.99 1"
+             control_name="ScriptErrorColor" enabled="true" follows="left|top"
+             height="56" label="Errors" left_delta="48" mouse_opaque="true"
+             name="script_error" width="44" />
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
             can_apply_immediately="true" color="0.7 0.9 0.7 1"
             control_name="ObjectChatColor" enabled="true" follows="left|top"
-             height="56" label="Objects" left_delta="48" mouse_opaque="true"
+             height="56" label="Objects" left="148" mouse_opaque="true"
             name="objects" width="44" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
             can_apply_immediately="true" color="0.7 0.9 0.7 1"
             control_name="llOwnerSayChatColor" enabled="true" follows="left|top"
             height="56" label="Owner" left_delta="48" mouse_opaque="true" name="owner"
             width="44" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
             can_apply_immediately="true" color="0 0 0 1"
             control_name="BackgroundChatColor" enabled="true" follows="left|top"
             height="56" label="Bubble" left_delta="48" mouse_opaque="true"
             name="background" width="44" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
             can_apply_immediately="true" color="0.6 0.6 1 1"
             control_name="HTMLLinkColor" enabled="true" follows="left|top" height="56"
             label="URLs" left_delta="48" mouse_opaque="true" name="links" width="44" />
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-160" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-185" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
+             mouse_opaque="false" name="text_box8" v_pad="0" width="128">
+                Script Errors:
+        </text>
+        <check_box bottom="-192" control_name="ScriptErrorsAsChat" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+             label="Show script errors and warnings as regular chat" left="148"
+             mouse_opaque="true" name="script_errors_as_chat" radio_style="false"
+             width="275" />
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
             mouse_opaque="false" name="text_box3" v_pad="0" width="135">
                Chat Console:
        </text>
-        <spinner bottom_delta="-6" control_name="ChatPersistTime" decimal_digits="0"
+        <spinner bottom_delta="-27" control_name="ChatPersistTime" decimal_digits="0"
             enabled="true" follows="left|top" height="16" increment="1"
             initial_val="10" label="Fade chat after" label_width="80" left="148"
             max_val="60" min_val="2" mouse_opaque="true" name="fade_chat_time"
@@ -91,25 +111,25 @@
             width="60">
                (# lines)
        </text>
-        <slider bottom="-185" can_edit_text="false" control_name="ConsoleBackgroundOpacity"
+        <slider bottom="-215" can_edit_text="false" control_name="ConsoleBackgroundOpacity"
             decimal_digits="3" enabled="true" follows="left|top" height="12"
             increment="0.05" initial_val="1" label="Opacity" left="148" max_val="1"
             min_val="0" mouse_opaque="true" name="console_opacity" show_text="true"
             value="0.4" width="200" />
+        <check_box bottom="-262" control_name="ChatFullWidth" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+             label="Use full screen width  (Requires restart)" left="148"
+             mouse_opaque="true" name="chat_full_width_check" radio_style="false"
+             width="239" />
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-207" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-278" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
             mouse_opaque="false" name="text_box6" v_pad="0" width="135">
                Chat Options:
        </text>
-        <check_box bottom_delta="-6" control_name="ChatFullWidth" enabled="true"
+        <check_box bottom_delta="-10" control_name="CloseChatOnReturn" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Chat uses full screen width (after restart)" left="148"
+             label="Close chat bar after hitting return" left="148" mouse_opaque="true"
-             mouse_opaque="true" name="chat_full_width_check" radio_style="false"
-             width="239" />
-        <check_box bottom_delta="-20" control_name="CloseChatOnReturn" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Close chat after hitting return" left="148" mouse_opaque="true"
             name="close_chat_on_return_check" radio_style="false" width="237" />
        <check_box bottom_delta="-20" control_name="ArrowKeysMoveAvatar" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
@@ -118,37 +138,25 @@
             width="237" />
        <check_box bottom_delta="-20" control_name="ChatShowTimestamps" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Show timestamps in chat" left="148" mouse_opaque="true"
+             label="Show timestamps in Local Chat" left="148" mouse_opaque="true"
             name="show_timestamps_check" radio_style="false" width="237" />
+        <check_box bottom_delta="-20" control_name="PlayTypingAnim" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+             label="Play typing animation when chatting" left="148" mouse_opaque="true"
+             name="play_typing_animation" radio_style="false" width="237" />
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-292" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-369" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
             mouse_opaque="false" name="text_box7" v_pad="0" width="128">
                Bubble Chat:
        </text>
-        <check_box bottom="-299" control_name="UseChatBubbles" enabled="true" follows="left|top"
+        <check_box bottom="-376" control_name="UseChatBubbles" enabled="true" follows="left|top"
             font="SansSerifSmall" height="16" initial_value="false"
             label="Show chat bubbles" left="148" mouse_opaque="true"
             name="bubble_text_chat" radio_style="false" width="237" />
-        <slider bottom="-315" can_edit_text="false" control_name="ChatBubbleOpacity"
+        <slider bottom="-392" can_edit_text="false" control_name="ChatBubbleOpacity"
             decimal_digits="3" enabled="true" follows="left|top" height="12"
             increment="0.05" initial_val="1" label="Opacity" left="148" max_val="1"
             min_val="0" mouse_opaque="true" name="bubble_chat_opacity" show_text="true"
             value="0.5" width="200" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-339" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-             mouse_opaque="false" name="text_box8" v_pad="0" width="128">
-                Script Errors:
-        </text>
-        <check_box bottom="-346" control_name="ScriptErrorsAsChat" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Show script errors and warnings as regular chat" left="148"
-             mouse_opaque="true" name="script_errors_as_chat" radio_style="false"
-             width="275" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-403"
-             can_apply_immediately="true" color="0.82 0.82 0.99 1"
-             control_name="ScriptErrorColor" enabled="true" follows="left|top"
-             height="56" label="Color" left="148" mouse_opaque="true"
-             name="script_error" width="48" />
 </panel>
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 99a376b..67d3307 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
@@ -72,26 +72,22 @@
             follows="left|top" height="16" increment="1" initial_val="300"
             label="Away Timeout:" label_width="141" left="10" max_val="600"
             min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" />
-        <check_box bottom="-286" control_name="ChatOnlineNotification" enabled="true"
+        <check_box bottom="-286" control_name="MiniMapRotate" enabled="true" follows="left|top"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Show Online Friend Notifications" left="151" mouse_opaque="true"
-             name="friends_online_notify_checkbox" radio_style="false" width="256" />
-        <check_box bottom="-304" control_name="MiniMapRotate" enabled="true" follows="left|top"
             font="SansSerifSmall" height="16" initial_value="false"
             label="Rotate Mini-Map" left="151" mouse_opaque="true"
             name="rotate_mini_map_checkbox" radio_style="false" width="256" />
-        <check_box bottom="-322" control_name="NotifyMoneyChange" enabled="true"
+        <check_box bottom="-304" control_name="NotifyMoneyChange" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
             label="Notify when Linden dollars (L$) spent or received" left="151"
             mouse_opaque="true" name="notify_money_change_checkbox" radio_style="false"
             width="256" />
-        <check_box bottom="-340" control_name="UseDefaultColorPicker" enabled="true"
+        <check_box bottom="-322" control_name="UseDefaultColorPicker" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
             label="Use default system color picker" left="151" mouse_opaque="true"
             name="use_system_color_picker_checkbox" radio_style="false"
             tool_tip="Use the default system color picker instead of the one built into Second Life."
             width="256" />
-        <check_box bottom="-358" control_name="ShowSearchBar" enabled="true" follows="left|top"
+        <check_box bottom="-340" control_name="ShowSearchBar" enabled="true" follows="left|top"
             font="SansSerifSmall" height="16" initial_value="false"
             label="Show search panel in overlay bar" left="151" mouse_opaque="true"
             name="show_search_panel" radio_style="false"
@@ -121,13 +117,13 @@
                seconds
        </text>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-380" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-362" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
             mouse_opaque="true" name="crash_report_textbox" v_pad="0" width="394">
                Crash reports:
        </text>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-402" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-384" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
             mouse_opaque="true" name="language_textbox" v_pad="0" width="394">
                Language:
@@ -142,7 +138,7 @@
        <string name="region_name_prompt">
                &lt;Type region name&gt;
        </string>
-        <combo_box allow_text_entry="false" bottom="-380" enabled="true" follows="left|top"
+        <combo_box allow_text_entry="false" bottom="-362" enabled="true" follows="left|top"
             height="18" left="153" max_chars="20" mouse_opaque="true"
             name="crash_behavior_combobox" width="146">
                <combo_item type="string" length="1" enabled="true" name="Askbeforesending" value="Ask before sending">
@@ -155,7 +151,7 @@
                        Never send
                </combo_item>
        </combo_box>
-        <combo_box allow_text_entry="true" bottom="-400" control_name="Language" enabled="true"
+        <combo_box allow_text_entry="true" bottom="-382" control_name="Language" enabled="true"
             follows="left|bottom" height="16" left="153" max_chars="135"
             mouse_opaque="true" name="language_combobox" width="146">
                <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
@@ -186,4 +182,12 @@
                        Español (Spanish) - Beta
                </combo_item>
        </combo_box>
+        <check_box bottom="-400" control_name="LanguageIsPublic" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+             initial_value="false" label="Share language with objects" left="151"
+             mouse_opaque="true" name="language_is_public"
+             radio_style="false"
+             tool_tip="This lets in-world objects know your preferred language."
+             width="256" />
 </panel>
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 493b153..279202a 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
@@ -6,11 +6,11 @@
             bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
             mouse_opaque="false" name="text_box" v_pad="0" width="128">
-                Profile Online Status:
+                My Online Status:
        </text>
        <check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall"
             height="16" initial_value="false"
-             label="Make my online status visible only to my Friends and Groups"
+             label="Only my Friends and Groups can see when I am online"
             left="148" mouse_opaque="true" name="online_visibility" radio_style="false"
             width="350" />
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -28,59 +28,66 @@
             width="350" />
        <check_box bottom="-65" control_name="IMInChatHistory" enabled="true" follows="left|top"
             font="SansSerifSmall" height="16" initial_value="false"
-             label="Include IM in Chat History" left="148" mouse_opaque="true"
+             label="Include IM in Local Chat" left="148" mouse_opaque="true"
             name="include_im_in_chat_history" radio_style="false" width="237" />
        <check_box bottom="-85" control_name="IMShowTimestamps" enabled="true" follows="left|top"
             font="SansSerifSmall" height="16" 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="ChatOnlineNotification" enabled="true"
+         follows="left|top" font="SansSerifSmall" height="16"
+         initial_value="false" label="Show online Friend notifications" left="148"
+         mouse_opaque="true" name="friends_online_notify_checkbox"
+         radio_style="false" width="256" />
        <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"
+             bottom="-125" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="10" 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"
+        <text_editor type="string" length="1" bottom="-185" embedded_items="false" enabled="true" follows="left|top"
             font="SansSerifSmall" height="70" 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"
+             bottom="-218" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
             mouse_opaque="false" name="text_box4" v_pad="0" width="128">
                Logging Options:
        </text>
-        <check_box bottom="-205" control_name="LogInstantMessages" enabled="true"
+        <check_box bottom="-225" control_name="LogInstantMessages" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+             follows="left|top" font="SansSerifSmall" height="16"
-             label="Log Instant Messages" left="148" mouse_opaque="true"
+             initial_value="false" label="Save a log of IM on my computer" left="148"
-             name="log_instant_messages" radio_style="false" width="237" />
+             mouse_opaque="true" name="log_instant_messages" radio_style="false"
-        <check_box bottom="-225" control_name="IMLogTimestamp" enabled="true" follows="left|top"
+             width="237" />
-             font="SansSerifSmall" height="16" initial_value="false"
+        <check_box bottom="-245" control_name="IMLogTimestamp" enabled="true"
-             label="Show timestamps in IM Log" left="148" mouse_opaque="true"
+             follows="left|top" font="SansSerifSmall" height="16"
-             name="log_instant_messages_timestamp" radio_style="false" width="237" />
+             initial_value="false" label="Show timestamps in IM Log" left="168"
-        <check_box bottom="-245" control_name="LogShowHistory" enabled="true" follows="left|top"
+             mouse_opaque="true" name="log_instant_messages_timestamp" radio_style="false"
+             width="217" />
+        <check_box bottom="-265" control_name="LogShowHistory" enabled="true" follows="left|top"
             font="SansSerifSmall" height="16" initial_value="false"
-             label="Show end of last IM conversation" left="148" mouse_opaque="true"
+             label="Show the end of last IM conversation" left="168" mouse_opaque="true"
-             name="log_show_history" radio_style="false" width="237" />
+             name="log_show_history" radio_style="false" width="217" />
-        <check_box bottom="-265" control_name="LogChat" enabled="true" follows="left|top"
+        <check_box bottom="-285" control_name="LogChat" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false" label="Log Chat"
+             font="SansSerifSmall" height="16" initial_value="false" label="Save a log of Local Chat on my computer"
             left="148" mouse_opaque="true" name="log_chat" radio_style="false"
             width="237" />
-        <check_box bottom="-285" control_name="LogChatTimestamp" enabled="true" follows="left|top"
+        <check_box bottom="-305" control_name="LogChatTimestamp" enabled="true" follows="left|top"
             font="SansSerifSmall" height="16" initial_value="false"
-             label="Show timestamps in Chat Log" left="148" mouse_opaque="true"
+             label="Show timestamps in Local Chat log" left="168" mouse_opaque="true"
-             name="log_chat_timestamp" radio_style="false" width="237" />
+             name="log_chat_timestamp" radio_style="false" width="217" />
-        <check_box bottom="-305" control_name="LogChatIM" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" 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" initial_value="false"
-             label="Include Date with Timestamp" left="148" mouse_opaque="true"
+             label="Include date with timestamp" left="168" mouse_opaque="true"
-             name="log_date_timestamp" radio_style="false" width="237" />
+             name="log_date_timestamp" radio_style="false" width="217" />
-        <button bottom="-347" follows="right|bottom" font="SansSerif" halign="center"
+        <check_box bottom="-345" control_name="LogChatIM" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Show incoming IM in Local Chat log" left="168" mouse_opaque="true"
+             name="log_chat_IM" radio_style="false" width="217" />
+        <button bottom="-367" 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="-346"
+        <line_editor border_drop_shadow_visible="false" border_visible="false" bottom="-366"
             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" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
index 5e8f871..11d15f4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
@@ -2,17 +2,26 @@
 <panel border="true" bottom="0" height="500" label="Popups" left="0" name="popups"
     title="Popups" width="400">
        <text bottom="-20" follows="top|left" left="15" width="300" name="dont_show_label">
-                Do not show popups:
+                Do not show these popups:
        </text>
        <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" />
+             name="enable_popup" width="175" />
-        <text follows="top|left" left="15" width="128" name="show_label">
+        <button follows="top|left" height="20" label="Enable all popups..." left="200"
-                Show popups:
+             name="reset_dialogs_btn"
+             tool_tip="Enable all of the optional popups and &apos;first time use&apos; notifications."
+             width="175" bottom_delta="0" />
+        <text follows="top|left" left="15" width="128" name="show_label" bottom_delta="-24">
+                Show these popups:
        </text>
        <scroll_list follows="top|left" height="88" left="15" name="enabled_popups" width="480" />
+        <button bottom_delta="-24" follows="top|left" height="20"
+             label="Disable all these popups..." left="200"
+             name="skip_dialogs_btn"
+             tool_tip="Disable all of the optional popups and &apos;first time use&apos; notifications."
+             width="175" />
        <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"
+             bottom_delta="-24" drop_shadow_visible="true" enabled="true"
             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
             height="10" left="15" mouse_opaque="false" name="text_box2" v_pad="0"
             width="270">
@@ -26,14 +35,8 @@
             follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
             label="Automatically view after accepting" left="40" mouse_opaque="true"
             name="show_new_inventory" radio_style="false" width="270" />
-        <button bottom_delta="-35" follows="top|left" height="20"
+        <check_box bottom_delta="-20" control_name="ShowInInventory" enabled="true"
-             label="Show all &apos;Skip next time&apos; Dialogs..." left="15"
+             follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-             name="reset_dialogs_btn"
+             label="Automatically show newly accepted objects in inventory" left="18" mouse_opaque="true"
-             tool_tip="Enable all of the optional popups and &apos;first time use&apos; notifications."
+             name="show_in_inventory" radio_style="false" width="270" />
-             width="250" />
-        <button bottom_delta="-24" follows="top|left" height="20"
-             label="Skip all &apos;Skip next time&apos; Dialogs..." left="15"
-             name="skip_dialogs_btn"
-             tool_tip="Disable all of the optional popups and &apos;first time use&apos; notifications."
-             width="250" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_region_debug.xml b/linden/indra/newview/skins/default/xui/en-us/panel_region_debug.xml
index b1c2bb7..3e1cfcd 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_region_debug.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_region_debug.xml
@@ -26,16 +26,34 @@
             left="160" name="disable_physics_help" width="18" />
        <button bottom_delta="-30" enabled="false" follows="left|top" height="20" label="Apply"
             left="60" name="apply_btn" width="100" />
-        <button bottom_delta="-50" follows="left|top" height="20" label="Choose Avatar..."
+        <text bottom_delta="-50" follows="left|top" height="20" left="10" width="90">
-             left="10" name="choose_avatar_btn" width="150" />
+          Object Return
-        <text bottom_delta="0" follows="left|top" height="20" left="170"
+        </text>
-             name="target_avatar_name" width="150" />
+        <text bottom_delta="-25" follows="left|top" height="20" left="30" width="60">
-        <button bottom_delta="-23" follows="left|top" height="20"
+          Resident:
-             label="Return avatar&apos;s scripted objects on other people&apos;s land"
+        </text>
-             left="50" name="return_scripted_other_land_btn" width="350" />
+        <line_editor bottom_delta="2" follows="left|top" height="20" left="90" 
-        <button bottom_delta="-23" follows="left|top" height="20"
+                 border_style="line" border_thickness="1" enabled="false" max_length="254" mouse_opaque="false"
-             label="Return ALL of avatar&apos;s scripted objects" left="50"
+             name="target_avatar_name" width="180">
-             name="return_scripted_all_btn" width="350" />
+          (none)
+    </line_editor>
+        <button bottom_delta="0" follows="left|top" height="20" label="Choose..."
+             left="280" name="choose_avatar_btn" width="80" />
+        <text bottom_delta="-25" follows="left|top" height="20" left="30" width="60">
+          Options:
+        </text>
+    <check_box bottom_delta="0" follows="left|top" height="20" label="Return only those objects with scripts"
+         left="90" name="return_scripts"
+         tool_tip="Return only objects which have scripts." width="80" />
+    <check_box bottom_delta="-20" follows="left|top" height="20" label="Return only those objects on someone else's land"
+         left="90" name="return_other_land"
+         tool_tip="Return only objects which are on land belonging to someone else" width="80" />
+    <check_box bottom_delta="-20" follows="left|top" height="20" label="Return objects in every region of this estate"
+         left="90" name="return_estate_wide"
+         tool_tip="Return objects in all of the regions that make up this estate" width="80" />
+        <button bottom_delta="-25" follows="left|top" height="20"
+             label="Return"
+             left="30" name="return_btn" width="80" />
        <button bottom_delta="-50" follows="left|top" height="20" label="Get Top Colliders..."
             left="10" name="top_colliders_btn"
             tool_tip="List of objects experiencing the most potential collisions"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml b/linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml
index fa172aa..84ce9d0 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml
@@ -75,6 +75,7 @@ regions in the estate.
        </text>
        <line_editor bottom_delta="-16" follows="top|left" height="19" left="15" max_length="254"
             name="abuse_email_address" width="205" />
+        <string name="email_unsupported">Feature unsupported</string>
        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
             name="abuse_email_address_help" right="250" width="18" />
        <button bottom_delta="-26" enabled="false" follows="left|top" height="20" label="Apply"
diff --git a/linden/indra/newview/skins/default/xui/en-us/role_actions.xml b/linden/indra/newview/skins/default/xui/en-us/role_actions.xml
index bcd23d5..58c6bcc 100644
--- a/linden/indra/newview/skins/default/xui/en-us/role_actions.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/role_actions.xml
@@ -181,4 +181,17 @@
                     longdescription="Members in a Role with this Ability can vote on proposals in Group Information &gt; Proposals tab."
                     name="proposal vote" value="45" />
        </action_set>
+        <action_set
+             description="These Abilities include powers to allow or restrict access to group chat sessions and group voice chat." 
+             name="Chat">
+                <action description="Join Group Chat"
+                     longdescription="Members in a Role with this Ability can join group chat sessions, for text and voice."
+                     name="join group chat" value="16" />
+                <action description="Join Group Voice Chat"
+                     longdescription="Members in a Role with this Ability can join group voice chat sessions.  NOTE: The Join Group Chat ability is required to access the voice chat session."
+                     name="join voice chat" value="27" />       
+                <action description="Moderate Group Chat"
+                     longdescription="Members in a Role with this Ability can control access and participation in group voice and text chat sessions."
+                     name="moderate group chat" value="37" />
+        </action_set>
 </role_actions>
diff --git a/linden/indra/newview/skins/default/xui/en-us/strings.xml b/linden/indra/newview/skins/default/xui/en-us/strings.xml
index 9952d56..cd49e59 100644
--- a/linden/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/strings.xml
@@ -12,6 +12,7 @@
        <string name="LoginAttempt">Previous login attempt failed. Logging in, attempt [NUMBER]</string>
        <string name="LoginPrecaching">Loading world...</string>
        <string name="LoginInitializingBrowser">Initializing embedded web browser...</string>
+        <string name="LoginInitializingMultimedia">Initializing multimedia...</string>
        <string name="LoginVerifyingCache">Verifying cache files (can take 60-90 seconds)...</string>
        <string name="LoginProcessingResponse">Processing Response...</string>
        <string name="LoginInitializingWorld">Initializing World...</string>
@@ -23,9 +24,12 @@
        <string name="LoginConnectingToRegion">Connecting to region...</string>
        <string name="LoginDownloadingClothing">Downloading clothing...</string>
+        <!-- Disconnection -->
+        <string name="AgentLostConnection">This region may be experiencing trouble.  Please check your connection to the Internet.</string>
        
        
-        <!-- Tooltip, llhoverview.cpp. Note: spaces at the end are intentional -->
+        <!-- Tooltip, llhoverview.cpp -->
        <string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar -->
        <string name="TooltipNoName">(no name)</string> <!-- No name on an object -->
        <string name="TooltipOwner">Owner:</string> <!-- Owner name follows -->
@@ -49,13 +53,15 @@
        <string name="TooltipFlagNoFly">No Fly</string>
        <string name="TooltipFlagGroupScripts">Group Scripts</string>
        <string name="TooltipFlagNoScripts">No Scripts</string>
-        
        <string name="TooltipLand">Land:</string>
-        
+        <string name="TooltipMustSingleDrop">Only a single item can be dragged here</string>    
        
        <!-- Indicates that an avatar's name or other similar datum is being retrieved. General usage. -->
        <string name="RetrievingData">Retrieving...</string>
-        
+        <string name="ReleaseNotes">Release Notes</string>
        <!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
        <string name="LoadingData">Loading...</string>
        
@@ -90,7 +96,7 @@
        <string name="AvatarAway">Away</string>
        <string name="AvatarBusy">Busy</string>
        <string name="AvatarMuted">Muted</string>
-        
        <!-- animations -->
        <string name="anim_express_afraid">Afraid</string>
        <string name="anim_express_anger">Angry</string>
@@ -162,5 +168,12 @@
        <string name="anim_yes_happy">Yes (Happy)</string>
        <string name="anim_yes_head">Yes</string>
        
+        <string name="texture_loading">Loading...</string>
+        <string name="worldmap_offline">Offline</string>
+        
+        <!-- Chat -->
+        <string name="whisper">whispers:</string>
+        <string name="shout">shouts:</string>
 </strings>
diff --git a/linden/indra/newview/skins/default/xui/es/alerts.xml b/linden/indra/newview/skins/default/xui/es/alerts.xml
index da0e94c..f9e91a0 100644
--- a/linden/indra/newview/skins/default/xui/es/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/es/alerts.xml
@@ -2827,17 +2827,6 @@ Aceleración de Gráficos AGP en el panel Opciones en Preferencias en [SECOND_LI
                        Cancelar
                </option>
        </alert>
-        <alert name="WebLaunchReleaseNotes">
-                <message name="message">
-                        ¿Ver las notas de lanzamiento de [SECOND_LIFE]?.
-                </message>
-                <option name="Gotopage">
-                        Ir hacia página
-                </option>
-                <option name="Cancel">
-                        Cancelar
-                </option>
-        </alert>
        <alert name="ReturnToOwner">
                <message name="message">
                        ¿Seguro que desea devolver los objetos
@@ -2907,7 +2896,7 @@ volverán para sus propietarios anteriores.
                        Desactivar sonido por el nombre apenas afecta chat y MI, no los sonidos. 
 Usted debe teclear el nombre exacto del objeto.
                </message>
-                <editline>
+                <editline name="editline">
                        Nombre del objeto
                </editline>
                <option name="OK">
@@ -3037,7 +3026,7 @@ del menú &apos;Editar&apos;.
                <message name="message">
                        ¿Expulsar a este usuario con cuál mensaje?
                </message>
-                <editline>
+                <editline name="editline">
                        Un administrador te desconectó.
                </editline>
                <option name="OK">
@@ -3051,7 +3040,7 @@ del menú &apos;Editar&apos;.
                <message name="message">
                        ¿Expulsar a todos en la red con cuál mensaje?
                </message>
-                <editline>
+                <editline name="editline">
                        Un administrador te desconectó.
                </editline>
                <option name="OK">
@@ -3065,7 +3054,7 @@ del menú &apos;Editar&apos;.
                <message name="message">
                        ¿Congelar este usuario con cuál mensaje?
                </message>
-                <editline>
+                <editline name="editline">
                        Usted fue congelado y no podrá moverse o usar el chat. Un administrador hará contacto vía mensaje
 instantáneo (MI).
                </editline>
@@ -3080,7 +3069,7 @@ instantáneo (MI).
                <message name="message">
                        ¿Descongelar este usuario con este mensaje?
                </message>
-                <editline>
+                <editline name="editline">
                        Usted no está congelado por mucho tiempo.
                </editline>
                <option name="OK">
@@ -3105,7 +3094,7 @@ instantáneo (MI).
                <message name="message">
                        ¿Ofrecer un teletransporte para su local con el siguiente mensaje?
                </message>
-                <editline>
+                <editline name="editline">
                        Juntarme a la [REGION]
                </editline>
                <option name="OK">
@@ -3119,7 +3108,7 @@ instantáneo (MI).
                <message name="message">
                        ¿Dios invoca usuario para su posición?
                </message>
-                <editline>
+                <editline name="editline">
                        Juntarme a la [REGION]
                </editline>
                <option name="OK">
diff --git a/linden/indra/newview/skins/default/xui/es/floater_html.xml b/linden/indra/newview/skins/default/xui/es/floater_html.xml
index ab36540..9985276 100644
--- a/linden/indra/newview/skins/default/xui/es/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_html.xml
@@ -6,4 +6,7 @@
        <button label="Parar" name="stop_btn" />
        <button label="Casa" name="home_btn" />
        <button label="Ir" name="go_btn" />
+        <string name="support_page_url">
+                http://secondlife.com/app/support/index_es.html
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/alerts.xml b/linden/indra/newview/skins/default/xui/fr/alerts.xml
index d8272d3..54af462 100644
--- a/linden/indra/newview/skins/default/xui/fr/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/fr/alerts.xml
@@ -2800,17 +2800,6 @@ l&apos;accélération graphique AGP dans les Options du menu Preferences dans [S
                        Annuler
                </option>
        </alert>
-        <alert name="WebLaunchReleaseNotes">
-                <message name="message">
-                        Afficher les notes de version de [SECOND_LIFE] ?
-                </message>
-                <option name="Gotopage">
-                        Aller à la page
-                </option>
-                <option name="Cancel">
-                        Annuler
-                </option>
-        </alert>
        <alert name="ReturnToOwner">
                <message name="message">
                        Etes-vous sûr(e) de vouloir renvoyer les objets
@@ -2880,7 +2869,7 @@ Quitter le groupe ?
                        Ignorer par nom n&apos;affecte que le chat et les IM, pas les sons.
 Vous devez entrer le nom exact de l&apos;objet.
                </message>
-                <editline>
+                <editline name="editline">
                        Nom de l&apos;objet
                </editline>
                <option name="OK">
@@ -3009,7 +2998,7 @@ dans le menu &apos;Edition&apos;.
                <message name="message">
                        Dégager cet utilisateur avec quel message ?
                </message>
-                <editline>
+                <editline name="editline">
                        Vous avez été déconnecté par un administrateur.
                </editline>
                <option name="OK">
@@ -3023,7 +3012,7 @@ dans le menu &apos;Edition&apos;.
                <message name="message">
                        Dégager tous les utilisateurs actuellement présents sur la grille avec quel message ?
                </message>
-                <editline>
+                <editline name="editline">
                        Vous avez été déconnecté par un administrateur.
                </editline>
                <option name="OK">
@@ -3037,7 +3026,7 @@ dans le menu &apos;Edition&apos;.
                <message name="message">
                        Bloquer cet utilisateur avec quel message ?
                </message>
-                <editline>
+                <editline name="editline">
                        Vous avez été bloqué. Vous ne pouvez ni vous déplacer, ni chatter. Un administrateur va vous contacter via message instantané (IM).
                </editline>
                <option name="OK">
@@ -3051,7 +3040,7 @@ dans le menu &apos;Edition&apos;.
                <message name="message">
                        Débloquer cet utilisateur avec quel message ?
                </message>
-                <editline>
+                <editline name="editline">
                        Vous n&apos;êtes plus bloqué.
                </editline>
                <option name="OK">
@@ -3076,7 +3065,7 @@ dans le menu &apos;Edition&apos;.
                <message name="message">
                        Proposer de téléporter la personne avec le message suivant ?
                </message>
-                <editline>
+                <editline name="editline">
                        Rejoins-moi à [REGION]
                </editline>
                <option name="OK">
@@ -3090,7 +3079,7 @@ dans le menu &apos;Edition&apos;.
                <message name="message">
                        Super-invoquer l&apos;utilisateur ici ?
                </message>
-                <editline>
+                <editline name="editline">
                        Rejoins-moi à [REGION]
                </editline>
                <option name="OK">
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_html.xml b/linden/indra/newview/skins/default/xui/fr/floater_html.xml
index c60d6ca..2297609 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_html.xml
@@ -6,4 +6,7 @@
        <button label="Arrêter" name="stop_btn" />
        <button label="Domicile" name="home_btn" />
        <button label="Aller" name="go_btn" />
+        <string name="support_page_url">
+                http://secondlife.com/app/support/index_fr.html
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ja/alerts.xml b/linden/indra/newview/skins/default/xui/ja/alerts.xml
index 6cc6379..a664d36 100644
--- a/linden/indra/newview/skins/default/xui/ja/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/ja/alerts.xml
@@ -3256,20 +3256,6 @@ F1キーを押してください。
                        取り消し
                </option>
        </alert>
-        <alert name="WebLaunchReleaseNotes">
-                <message name="message">
-                        [SECOND_LIFE] のリリースノートを閲覧しますか？
-                </message>
-                <ignore name="ignore">
-                        リリースノートを表示するため、ウェブ・ブラウザーを起動するとき
-                </ignore>
-                <option name="Gotopage">
-                        OK
-                </option>
-                <option name="Cancel">
-                        取り消し
-                </option>
-        </alert>
        <alert name="ReturnToOwner">
                <message name="message">
                        選択したオブジェクトを、所有者に返却しますか？
@@ -3350,7 +3336,7 @@ F1キーを押してください。
                        名前によるミュートは、オブジェクト・チャット、およびIMのみに影響し、サウンドには影響しません。 
 正確なオブジェクト名を入力する必要があります。
                </message>
-                <editline>
+                <editline name="editline">
                        オブジェクト名
                </editline>
                <option name="OK">
@@ -3491,7 +3477,7 @@ F1キーを押してください。
                <message name="message">
                        どんなメッセージを表示して、このユーザーを追い出しますか？
                </message>
-                <editline>
+                <editline name="editline">
                        あなたは管理者によりログオフされました。
                </editline>
                <option name="OK">
@@ -3505,7 +3491,7 @@ F1キーを押してください。
                <message name="message">
                        どんなメッセージを表示して、グリッドにいる全員を追い出しますか？
                </message>
-                <editline>
+                <editline name="editline">
                        あなたは管理者によりログオフされました。
                </editline>
                <option name="OK">
@@ -3519,7 +3505,7 @@ F1キーを押してください。
                <message name="message">
                        どんなメッセージを表示して、このユーザーをフリーズしますか？
                </message>
-                <editline>
+                <editline name="editline">
                        あなたはフリーズされています。 動くこともチャットすることもできません。 管理者がIMを通じてあなたに連絡します。
                </editline>
                <option name="OK">
@@ -3533,7 +3519,7 @@ F1キーを押してください。
                <message name="message">
                        どんなメッセージを表示して、このユーザーのフリーズを解除しますか？
                </message>
-                <editline>
+                <editline name="editline">
                        もうフリーズされていません。
                </editline>
                <option name="OK">
@@ -3558,7 +3544,7 @@ F1キーを押してください。
                <message name="message">
                        あなたのロケーションへのテレポートを次のメッセージと共に贈りますか？
                </message>
-                <editline>
+                <editline name="editline">
                        [REGION]に参加希望
                </editline>
                <option name="OK">
@@ -3572,7 +3558,7 @@ F1キーを押してください。
                <message name="message">
                        ユーザーをゴッド・コールで呼び寄せますか？
                </message>
-                <editline>
+                <editline name="editline">
                        [REGION]に参加希望
                </editline>
                <option name="OK">
@@ -4984,13 +4970,15 @@ Linden Lab
                <message name="message">
                        新しい空の名前を指定してください。
                </message>
+                <editline name="editline">
+                        新しい事前設定
+                </editline>
                <option name="OK">
                        OK
                </option>
                <option name="Cancel">
                        キャンセル
                </option>
-                新しい事前設定
        </alert>
        <alert name="ExistsSkyPresetAlert">
                <message name="message">
@@ -5001,13 +4989,15 @@ Linden Lab
                <message name="message">
                        新しい水の事前設定の名前を指定してください。
                </message>
+                <editline name="editline">
+                        新しい事前設定
+                </editline>
                <option name="OK">
                        OK
                </option>
                <option name="Cancel">
                        キャンセル
                </option>
-                新しい事前設定
        </alert>
        <alert name="ExistsWaterPresetAlert">
                <message name="message">
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_html.xml b/linden/indra/newview/skins/default/xui/ja/floater_html.xml
index 6e1e7a0..da63fab 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_html.xml
@@ -8,4 +8,7 @@
        <string name="home_page_url">
                http://jp.secondlife.com
        </string>
+        <string name="support_page_url">
+                http://help.secondlife.com/jp
+        </string>       
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_joystick.xml b/linden/indra/newview/skins/default/xui/ja/floater_joystick.xml
index b71cffa..0f1541a 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_joystick.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_joystick.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Joystick" title="ジョイスティックの設定">
        <check_box name="enable_joystick" width="120" >
                ジョイスティックを使う：
@@ -112,9 +112,15 @@
        <text left="0" name="ZoomDeadZone" width="140">
                ズーム・デッド・ゾーン
        </text>
-        <spinner left="275" name="FlycamAxisDeadZone6" width="50" />
+        <spinner left="275" width="50" name="FlycamAxisDeadZone6" />
-        <button label="SpaceNavigatorのデフォルト設定" left="330"
+        <button label="SpaceNavigatorのデフォルト設定" name="SpaceNavigatorDefaults" width="210" left="330"/>
-             name="SpaceNavigatorDefaults" width="210" />
+        <string name="JoystickMonitor">
+                ジョイスティック・モニター
+        </string>
+        <string name="Axis">
+                軸 [NUM]
+        </string>
        <string name="NoDevice">
                デバイスは検出されませんでした
        </string>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_region_estate.xml b/linden/indra/newview/skins/default/xui/ja/panel_region_estate.xml
index 42eaec0..d2fd70e 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_region_estate.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_region_estate.xml
@@ -46,9 +46,6 @@
        <check_box label="支払情報登録がないものを拒否" name="deny_anonymous" />
        <check_box label="支払情報登録があるものを拒否" name="deny_identified" />
        <check_box label="使用されている支払情報を拒否" name="deny_transacted" />
-        <text name="abuse_email_text">
-                [Abuse E-mail Beta]
-        </text>
        <button label="適用" name="apply_btn" />
        <text name="allow_resident_label">
                許可された住人:
diff --git a/linden/indra/newview/skins/default/xui/ko/alerts.xml b/linden/indra/newview/skins/default/xui/ko/alerts.xml
index 9ad1c5c..67bc992 100644
--- a/linden/indra/newview/skins/default/xui/ko/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/ko/alerts.xml
@@ -3284,20 +3284,6 @@ Applications 폴더에 다운로드하시겠습니까?
                        취소
                </option>
        </alert>
-        <alert name="WebLaunchReleaseNotes">
-                <message name="message">
-                        [SECOND_LIFE] 출시 정보를 보시겠습니까?
-                </message>
-                <ignore name="ignore">
-                        출시 정보를 보려고 웹 브라우저를 시작할 때
-                </ignore>
-                <option name="Gotopage">
-                        페이지로 이동
-                </option>
-                <option name="Cancel">
-                        취소
-                </option>
-        </alert>
        <alert name="ReturnToOwner">
                <message name="message">
                        선택한 오브젝트를 소유주에게
@@ -3378,7 +3364,7 @@ Applications 폴더에 다운로드하시겠습니까?
                        이름별 차단은 오브젝트 채팅과 메신저에만 영향을 주며 음소거는 하지 않습니다. 
 오브젝트의 이름을 정확하게 입력해야 합니다.
                </message>
-                <editline>
+                <editline name="editline">
                        오브젝트 이름
                </editline>
                <option name="OK">
@@ -3519,7 +3505,7 @@ Applications 폴더에 다운로드하시겠습니까?
                <message name="message">
                        어떤 메시지로 이 사용자를 추방합니까?
                </message>
-                <editline>
+                <editline name="editline">
                        관리자에 의해 로그오프되었습니다.
                </editline>
                <option name="OK">
@@ -3533,7 +3519,7 @@ Applications 폴더에 다운로드하시겠습니까?
                <message name="message">
                        그리드에 지금 메시지가 있는 모든 사람들을 추방합니까?
                </message>
-                <editline>
+                <editline name="editline">
                        관리자에 의해 로그오프되었습니다.
                </editline>
                <option name="OK">
@@ -3547,7 +3533,7 @@ Applications 폴더에 다운로드하시겠습니까?
                <message name="message">
                        어떤 메시지로 이 사용자를 동결 시킵니까?
                </message>
-                <editline>
+                <editline name="editline">
                        귀하는 정지된 상태이므로 이동하거나 대화를 나눌 수 없습니다. 관리자가 메신저를 통해 연락을 취할 것입니다.
                </editline>
                <option name="OK">
@@ -3561,7 +3547,7 @@ Applications 폴더에 다운로드하시겠습니까?
                <message name="message">
                        어떤 메시지를 사용하여 이 사용자의 동결 상태를 해제하시겠습니까?
                </message>
-                <editline>
+                <editline name="editline">
                        더 이상 정지 모드에 있지 않습니다.
                </editline>
                <option name="OK">
@@ -3586,7 +3572,7 @@ Applications 폴더에 다운로드하시겠습니까?
                <message name="message">
                        다음 메시지가 있는 내 위치로 텔레포팅을 제공합니까?
                </message>
-                <editline>
+                <editline name="editline">
                        [REGION]에 가입하기
                </editline>
                <option name="OK">
@@ -3600,7 +3586,7 @@ Applications 폴더에 다운로드하시겠습니까?
                <message name="message">
                        사용자를 귀하의 위치로 불러옵니까?
                </message>
-                <editline>
+                <editline name="editline">
                        [REGION]에 가입하기
                </editline>
                <option name="OK">
@@ -5043,13 +5029,15 @@ D 슬라이더를 사용해서는 구름의 농도를
                <message name="message">
                        새 하늘의 이름을 지정하십시오.
                </message>
+                <editline name="editline">
+                        새 사전 설정
+                </editline>
                <option name="OK">
                        확인
                </option>
                <option name="Cancel">
                        취소
                </option>
-                새 사전 설정
        </alert>
        <alert name="ExistsSkyPresetAlert">
                <message name="message">
@@ -5060,13 +5048,15 @@ D 슬라이더를 사용해서는 구름의 농도를
                <message name="message">
                        새 수면 사전 설정의 이름을 지정하십시오.
                </message>
+                <editline name="editline">
+                        새 사전 설정
+                </editline>
                <option name="OK">
                        확인
                </option>
                <option name="Cancel">
                        취소
                </option>
-                새 사전 설정
        </alert>
        <alert name="ExistsWaterPresetAlert">
                <message name="message">
diff --git a/linden/indra/newview/skins/default/xui/ko/floater_html.xml b/linden/indra/newview/skins/default/xui/ko/floater_html.xml
index c99763e..c4c2055 100644
--- a/linden/indra/newview/skins/default/xui/ko/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_html.xml
@@ -8,4 +8,7 @@
        <string name="home_page_url">
                http://kr.secondlife.com
        </string>
+        <string name="support_page_url">
+                http://help.secondlife.com/kr
+        </string>       
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ko/floater_joystick.xml b/linden/indra/newview/skins/default/xui/ko/floater_joystick.xml
index 25e532d..34537ab 100644
--- a/linden/indra/newview/skins/default/xui/ko/floater_joystick.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_joystick.xml
@@ -71,6 +71,12 @@
                확대/축소 사각지대
        </text>
        <button label="SpaceNavigator 기본값" name="SpaceNavigatorDefaults" />
+        <string name="JoystickMonitor">
+                조이스틱 검사
+        </string>
+        <string name="Axis">
+                축 [NUM]
+        </string>
        <string name="NoDevice">
                검색된 장치가 없습니다.
        </string>
diff --git a/linden/indra/newview/skins/default/xui/ko/panel_region_estate.xml b/linden/indra/newview/skins/default/xui/ko/panel_region_estate.xml
index a408180..52efd2e 100644
--- a/linden/indra/newview/skins/default/xui/ko/panel_region_estate.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_region_estate.xml
@@ -46,9 +46,6 @@
        <check_box label="결제수단 미등록자 출입 거부" name="deny_anonymous" />
        <check_box label="결제수단 등록자 출입 거부" name="deny_identified" />
        <check_box label="결제수단 사용자 출입 거부" name="deny_transacted" />
-        <text name="abuse_email_text">
-                [Abuse E-mail Beta]
-        </text>
        <button label="적용" name="apply_btn" />
        <text name="allow_resident_label">
                허용된 주민:
diff --git a/linden/indra/newview/skins/default/xui/pt/alerts.xml b/linden/indra/newview/skins/default/xui/pt/alerts.xml
index d80c7a5..46dae87 100644
--- a/linden/indra/newview/skins/default/xui/pt/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/pt/alerts.xml
@@ -2597,21 +2597,6 @@ Nota: Isto limpará o cache.
                </option>
        </alert>
-        <alert name="WebLaunchReleaseNotes">
-                <message name="message">
-                        Visite o [SECOND_LIFE] notas de lançamentos.
-                </message>
-                <ignore>
-                        Quano iniciar o navegador, visitar as notas de lançamento.
-                </ignore>
-                <option name="Gotopage">
-                        Ir para a página
-                </option>
-                <option name="Cancel">
-                        Cancelar
-                </option>
-        </alert>
        <alert name="ReturnToOwner">
                <message name="message">
                        Você tem certeza que quer devolver os objetos selecionados aos seus donos? A autoria dos objetos transferíveis retornará para os seu antigos donos. (Todos os objetos retornarão para as pastas que estavam localizados anteriormente.)* *AVISO* Nenhum objeto transferível acionado será deletado!
@@ -2685,7 +2670,7 @@ Nota: Isto limpará o cache.
                <message name="message">
                        Silenciar por nome somente afetará objetos, bate-papo e MI, mas não sons. Você deve digitar o nome do objeto corretamente.
                </message>
-                <editline>
+                <editline name="editline">
                        Nome do objeto
                </editline>
                <option name="OK">
@@ -2820,7 +2805,7 @@ Nota: Isto limpará o cache.
                <message name="message">
                        Expulsar este usuário com qual mensagem?
                </message>
-                <editline>
+                <editline name="editline">
                        Um administrador o desconectou.
                </editline>
                <option name="OK">
@@ -2835,7 +2820,7 @@ Nota: Isto limpará o cache.
                <message name="message">
                        Expulsar todo mundo atualmente do grid com qual mensagem?
                </message>
-                <editline>
+                <editline name="editline">
                        Um administrador te desconectou.
                </editline>
                <option name="OK">
@@ -2850,7 +2835,7 @@ Nota: Isto limpará o cache.
                <message name="message">
                        Paralise este usuário com qual mensagem?
                </message>
-                <editline>
+                <editline name="editline">
                        Você foi paralisado. Você não pode mover-se ou conversar. Um administrador entrará em contato com você através de mensagem instantânea (MI).
                </editline>
                <option name="OK">
@@ -2865,7 +2850,7 @@ Nota: Isto limpará o cache.
                <message name="message">
                        Liberar este usuário com qual mensagem?
                </message>
-                <editline>
+                <editline name="editline">
                        Você não está mais paralisado.
                </editline>
                <option name="OK">
@@ -2891,7 +2876,7 @@ Nota: Isto limpará o cache.
                <message name="message">
                        Oferecer um teletransporte para uma localização com a seguinte mensagem?
                </message>
-                <editline>
+                <editline name="editline">
                        Venha para [REGION]
                </editline>
                <option name="OK">
@@ -2906,7 +2891,7 @@ Nota: Isto limpará o cache.
                <message name="message">
                        God user convocou para a sua localização?
                </message>
-                <editline>
+                <editline name="editline">
                        Venha para [REGION]
                </editline>
                <option name="OK">
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_html.xml b/linden/indra/newview/skins/default/xui/pt/floater_html.xml
index d9caffc..daa441e 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_html.xml
@@ -6,4 +6,7 @@
        <text name="f1_help_url">
                http://secondlife.com/app/support/index_pt.html
        </text>
+        <string name="support_page_url">
+                http://secondlife.com/app/support/index_pt.html
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/notify.xml b/linden/indra/newview/skins/default/xui/pt/notify.xml
index 1e95e22..13c9975 100644
--- a/linden/indra/newview/skins/default/xui/pt/notify.xml
+++ b/linden/indra/newview/skins/default/xui/pt/notify.xml
@@ -197,12 +197,12 @@
        </notify>
        <notify name="InventoryAccepted">
                <message name="message">
-                        [NAME] aceitou seu convite de amizade.
+                        [NAME] aceitou seu convite de inventário.
                </message>
        </notify>
        <notify name="InventoryDeclined">
                <message name="message">
-                        [NAME] rejeitou seu convite de amizade
+                        [NAME] rejeitou seu convite de inventário.
                </message>
        </notify>
        <notify name="ObjectMessage">
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_region_estate.xml b/linden/indra/newview/skins/default/xui/pt/panel_region_estate.xml
index 1560505..f647abb 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_region_estate.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_region_estate.xml
@@ -37,7 +37,7 @@
        <check_box label="Informações de pagamento" name="deny_identified" />
        <check_box label="Informações de pagtos realizados" name="deny_transacted" />
        <text name="abuse_email_text">
-                [E-mail do abuso Beta]
+                E-mail do abuso:
        </text>
        <button label="Aplicar" name="apply_btn" />
        <text name="allow_resident_label">
diff --git a/linden/indra/newview/skins/default/xui/zh/alerts.xml b/linden/indra/newview/skins/default/xui/zh/alerts.xml
index 5aaaafa..641f1f3 100644
--- a/linden/indra/newview/skins/default/xui/zh/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/zh/alerts.xml
@@ -2835,17 +2835,6 @@ AGP绘图加速器起作用。Options panel in Preferences in [SECOND_LIFE].
                        取消
                </option>
        </alert>
-        <alert name="WebLaunchReleaseNotes">
-                <message name="message">
-                        是否查看[SECOND_LIFE] 发布的消息?.
-                </message>
-                <option name="Gotopage">
-                        回主页
-                </option>
-                <option name="Cancel">
-                        取消
-                </option>
-        </alert>
        <alert name="ReturnToOwner">
                <message name="message">
                        你确定要将所选东东归还至
@@ -2915,7 +2904,7 @@ AGP绘图加速器起作用。Options panel in Preferences in [SECOND_LIFE].
                        通过名字屏蔽声音只会影响对象聊天和即时消息, 不会影效果声音。 
 你必须准确键入对象的名字.
                </message>
-                <editline>
+                <editline name="editline">
                        东东名称
                </editline>
                <option name="OK">
@@ -3044,7 +3033,7 @@ from the &apos;Edit&apos; menu.
                <message name="message">
                        以哪句消息踢走此人?
                </message>
-                <editline>
+                <editline name="editline">
                        管理员已经迫使您下线。
                </editline>
                <option name="OK">
@@ -3058,7 +3047,7 @@ from the &apos;Edit&apos; menu.
                <message name="message">
                        以哪句消息踢走目前在此的每个人?
                </message>
-                <editline>
+                <editline name="editline">
                        管理员已经迫使您下线。
                </editline>
                <option name="OK">
@@ -3072,7 +3061,7 @@ from the &apos;Edit&apos; menu.
                <message name="message">
                        用哪一条通知冻结化身?
                </message>
-                <editline>
+                <editline name="editline">
                        你已经被冻结。你不能移动或聊天。管理员会通过即时信息联系你。
                </editline>
                <option name="OK">
@@ -3086,7 +3075,7 @@ from the &apos;Edit&apos; menu.
                <message name="message">
                        发送何种信息封锁该用户?
                </message>
-                <editline>
+                <editline name="editline">
                        你已经被解冻
                </editline>
                <option name="OK">
@@ -3111,7 +3100,7 @@ from the &apos;Edit&apos; menu.
                <message name="message">
                        用以下消息提供到你所在地的闪电传送?
                </message>
-                <editline>
+                <editline name="editline">
                        我要加入 [REGION]
                </editline>
                <option name="OK">
@@ -3125,7 +3114,7 @@ from the &apos;Edit&apos; menu.
                <message name="message">
                        是否神明召唤用户去你的位置?
                </message>
-                <editline>
+                <editline name="editline">
                        我要加入 [REGION]
                </editline>
                <option name="OK">
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_html.xml b/linden/indra/newview/skins/default/xui/zh/floater_html.xml
index 0232bdc..8c75fa7 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_html.xml
@@ -6,4 +6,7 @@
        <button label="停止" name="stop_btn" />
        <button label="家" name="home_btn" />
        <button label="行动" name="go_btn" />
+        <string name="support_page_url">
+                http://secondlife.com/app/support/index_zh.html
+        </string>
 </floater>