Merge branch 'weekly' into branding

Conflicts (solved):
	linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
	linden/indra/newview/llappviewer.cpp
	linden/indra/newview/llappviewerwin32.cpp

22 files changed, 275 insertions, 317 deletions

diff --git a/linden/indra/newview/skins/default/xui/de/notifications.xml b/linden/indra/newview/skins/default/xui/de/notifications.xml
index b2975df..3e08d33 100644
--- a/linden/indra/newview/skins/default/xui/de/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/de/notifications.xml
@@ -1442,21 +1442,6 @@ Die Option zum Austritt aus einer Gruppe finden Sie unter „Bearbeiten“ >
                         <button name="Cancel" text="Abbrechen"/>
                 </form>
         </notification>
-        <notification label="Linden-Grundstück ändern" name="ChangeLindenEstate">
-                Sie sind im Begriff, ein Grundstück in Linden-Besitz (Mainland, Teen-Raster, Orientierung usw.) zu verändern.
-
-Dies ist ÄUSSERST GEFÄHRLICH, da es grundlegende Auswirkungen auf das Benutzererlebnis hat.  Auf dem Mainland werden tausende Regionen geändert, was den Spaceserver stark belastet.
-
-Fortfahren?
-                <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
-        </notification>
-        <notification label="Zugang zu Linden-Grundstück ändern" name="ChangeLindenAccess">
-                Sie sind im Begriff, die Zugangsliste für ein Grundstück in Linden-Besitz (Mainland, Teen-Raster, Orientierung usw.) zu verändern.
-
-Dies ist GEFÄHRLICH und sollte nur erfolgen, um Objekte/L$ per Hack in und aus dem Raster zu entfernen.
-Tausende Regionen werden verändert und der Spaceserver wird dadurch stark belastet.
-                <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
-        </notification>
         <notification label="Grundstück wählen" name="EstateAllowedAgentAdd">
                 Nur für dieses Grundstück oder für alle [ALL_ESTATES] zur Erlaubnisliste hinzufügen?
                 <usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Alle Grundstücke" yestext="Dieses Grundstück"/>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml b/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
index a0dd938..d5b61a7 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
@@ -1172,11 +1172,15 @@ scratch and wear it.
             <texture_picker name="Lower Tattoo" label="Lower Tattoo" tool_tip="Click to choose a picture"
              can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
              follows="left|top" width="70" height="80" left="14" bottom="-325"/>
+                        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-415"
+                             can_apply_immediately="true" color="1 1 1 1" follows="left|top" height="80"
+                             label="Color/Tint" left="14" mouse_opaque="true" name="Color/Tint"
+                             tool_tip="Click to open Color Picker" width="70" />
                         <button name="Create New" label="Create New Tattoo" label_selected="Create New Tattoo"
                  follows="left|top" halign="center" width="170" height="24" left="8" bottom="-128"
                              mouse_opaque="true" scale_image="true"/>
             <button name="Take Off" label="Take Off" label_selected="Take Off"
-             follows="left|top" width="82" height="20" left="8" bottom="-365"/>
+             follows="left|top" width="82" height="20" left="8" bottom="-440"/>
             <button name="Save" label="Save" label_selected="Save"
              follows="right|bottom" width="82" height="20" left="123" bottom="-478"/>
             <button name="Save As" label="Save As..." label_selected="Save As..."
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_display_name.xml b/linden/indra/newview/skins/default/xui/en-us/floater_display_name.xml
new file mode 100644
index 0000000..5875efb
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_display_name.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Display Name" title="CHANGE DISPLAY NAME"
+ can_minimize="true" can_close="true" can_resize="false"
+ enabled="true" mouse_opaque="true" 
+ height="235" width="440">
+        <text name="info_text1" font="SansSerif" wrap="true"
+         height="18" width="380" left="42" bottom_delta="-48" follows="left|top">
+                The name you give to your avatar is called your Display Name.
+        </text>
+        <text name="info_text2" font="SansSerif" wrap="true"
+         height="18" width="300" left="120" bottom_delta="-18" follows="left|top">
+                You can change it once a week.
+        </text>
+        <text name="now_ok_text" font="SansSerif"
+         height="18" width="320" left="105" bottom_delta="-25" follows="left|top">
+                You can change it now if you so wish.
+        </text>
+        <text name="lockout_text" font="SansSerif" visible="false"
+         height="18" width="380" left="20" bottom_delta="0" follows="left|top">
+                You cannot change it before: [TIME].
+        </text>
+        <text name="set_name_label" font="SansSerif"
+         height="20" width="380" left="20" bottom_delta="-25" follows="left|top">
+                New Display Name:
+        </text>
+        <line_editor name="display_name_editor" max_length="31"
+         height="20" width="360" left="40" bottom_delta="-20" follows="left|top" />
+        <text name="name_confirm_label" font="SansSerif"
+         height="20" width="380" left="20" bottom_delta="-32" follows="left|top">
+                Type your new name again to confirm:
+        </text>
+        <line_editor name="display_name_confirm" max_length="31"
+         height="20" width="360" left="40" bottom_delta="-20" follows="left|top" />
+    <button name="save_btn" label="Save" font="SansSerif"
+         tool_tip="Save your new Display Name"
+     height="20" width="120" left="30" bottom_delta="-32"/>
+    <button name="reset_btn" label="Reset" font="SansSerif"
+         tool_tip="Make Display Name the same as Username"
+     height="20" width="120" left_delta="130" bottom_delta="0"/>
+    <button name="cancel_btn" label="Cancel" font="SansSerif"
+     height="20" width="120" left_delta="130" bottom_delta="0"/>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_new_im.xml b/linden/indra/newview/skins/default/xui/en-us/floater_new_im.xml
index c93b890..5d766be 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_new_im.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_new_im.xml
@@ -8,7 +8,7 @@
              column_padding="5" draw_border="true" draw_heading="false"
              draw_stripes="true" enabled="true" follows="left|top|right|bottom"
              height="290" left="6" mouse_opaque="true" multi_select="false"
-             name="user_list" width="421" />
+             name="user_list" use_display_names="true" width="421" />
         <button bottom="-271" enabled="true" follows="right|bottom" font="SansSerif"
              halign="center" height="20" label="Start" label_selected="Start" left="435"
              mouse_opaque="true" name="start_btn" scale_image="true" sound_flags="0"
@@ -17,9 +17,6 @@
              halign="center" height="20" label="Close" label_selected="Close" left="435"
              mouse_opaque="true" name="close_btn" scale_image="true" sound_flags="0"
              width="60" />
-        <string name="name_format">
-                [FIRST] [LAST]
-        </string>
         <string name="online_descriptor">
                 (online)
         </string>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml b/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml
index 81dd05a..69e62f8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml
@@ -21,7 +21,7 @@
         <check_box bottom="-276" enabled="true" follows="left|top" font="SansSerifSmall"
              height="16" initial_value="false" label="Eyes" left="13"
              mouse_opaque="true" name="checkbox_Eyes" radio_style="false" width="100" />
-        <check_box bottom="-456" enabled="true" follows="left|top" font="SansSerifSmall"
+        <check_box bottom="-434" enabled="true" follows="left|top" font="SansSerifSmall"
              height="16" initial_value="false" label="Rename Clothing To Folder Name"
              left="13" mouse_opaque="true" name="rename" radio_style="false" width="210" />
         <check_box bottom="-216" enabled="true" follows="left|top" font="SansSerifSmall"
@@ -256,7 +256,7 @@ now wearing into it.
                 Attachments:
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-436" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-414" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
              mouse_opaque="true" name="Options:" v_pad="0" width="100">
                 Options:
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 daf217e..314ad20 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
@@ -154,7 +154,7 @@
              mouse_opaque="true" name="spin y"

              tool_tip="Y coordinate of location to show on map" width="48" />

         <spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16"

-             increment="1" initial_val="0" left_delta="50" max_val="4096" min_val="0"

+             increment="1" initial_val="0" left_delta="50" max_val="16383" min_val="0"

              mouse_opaque="true" name="spin z"

              tool_tip="Z coordinate of location to show on map" width="48" />

         <button bottom="-625" follows="right|bottom" font="SansSerif" halign="center"

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 31e730a..c2424d7 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
@@ -259,6 +259,11 @@
                 userdata="appearance" />
       <on_enable function="Edit.EnableCustomizeAvatar" />
     </menu_item_call>
+    <menu_item_call bottom="-362" enabled="true" height="19" label="Display Name..." left="0"
+                    mouse_opaque="true" name="Display Name..." width="153">
+        <on_click function="ShowFloater" userdata="displayname" />
+        <on_enable function="Edit.EnableDisplayName" />
+    </menu_item_call>
     <menu_item_separator />
     <menu_item_check name="Friends" label="Friends"
                      shortcut="control|shift|F">
@@ -267,7 +272,8 @@
       <on_check function="FloaterVisible"
                 userdata="friends" />
     </menu_item_check>
-    <menu_item_call name="Groups" label="Groups">
+    <menu_item_call name="Groups" label="Groups"
+                    shortcut="control|shift|G">
       <on_click function="ShowAgentGroups"
                 userdata="agent" />
     </menu_item_call>
@@ -1965,6 +1971,13 @@
         <on_click function="Advanced.DumpAttachments"
                   userdata="" />
       </menu_item_call>
+      <menu_item_call
+              label="Reload Avatar Cloud Particle"
+              name="Reload Avatar Cloud Particle">
+                <on_click
+                 function="Advanced.ReloadAvatarCloudParticle"
+                 userdata="" />
+      </menu_item_call>
     </menu>
 
     <!-- CRASH -->
diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml
index 61067da..5ee4ed0 100644
--- a/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml
@@ -142,7 +142,7 @@
                         audio
                 </widgettype>
                 <impl>
-                        media_plugin_quicktime
+                        media_plugin_gstreamer010
                 </impl>
         </mimetype>
         <mimetype name="video/*">
@@ -197,8 +197,8 @@
                         audio
                 </widgettype>
                 <impl>
-                        media_plugin_quicktime
-                </impl>
+      media_plugin_gstreamer010
+    </impl>
         </mimetype>
         <mimetype name="application/pdf">
                 <label name="application/pdf_label">
@@ -274,8 +274,8 @@
                         audio
                 </widgettype>
                 <impl>
-                        media_plugin_quicktime
-                </impl>
+      media_plugin_gstreamer010
+    </impl>
         </mimetype>
         <mimetype name="audio/mpeg">
                 <label name="audio/mpeg_label">
@@ -285,8 +285,8 @@
                         audio
                 </widgettype>
                 <impl>
-                        media_plugin_quicktime
-                </impl>
+      media_plugin_gstreamer010
+    </impl>
         </mimetype>
         <mimetype name="audio/x-aiff">
                 <label name="audio/x-aiff_label">
@@ -296,8 +296,8 @@
                         audio
                 </widgettype>
                 <impl>
-                        media_plugin_quicktime
-                </impl>
+      media_plugin_gstreamer010
+    </impl>
         </mimetype>
         <mimetype name="audio/x-wav">
                 <label name="audio/x-wav_label">
@@ -307,8 +307,8 @@
                         audio
                 </widgettype>
                 <impl>
-                        media_plugin_quicktime
-                </impl>
+      media_plugin_gstreamer010
+    </impl>
         </mimetype>
         <mimetype menu="1" name="image/bmp">
                 <label name="image/bmp_label">
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index be29df8..358dbbf 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -3194,30 +3194,11 @@ Type a short announcement which will be sent to everyone currently in your estat
 
 <notification
  icon="alert.tga"
- label="Change Linden Estate"
- name="ChangeLindenEstate"
+ label="Pfft some old linden crap"
+ name="PfftLindenCrap"
  type="alert">
-You are about to change a Linden owned estate (mainland, teen grid, orientation, etc.).
-
-This is EXTREMELY DANGEROUS because it can fundamentally affect the user experience.  On the mainland, it will change thousands of regions and make the spaceserver hiccup.
-
-Proceed?
-  <usetemplate
-   name="okcancelbuttons"
-   notext="Cancel"
-   yestext="OK"/>
-</notification>
-
-<notification
- icon="alert.tga"
- label="Change Linden Estate Access"
- name="ChangeLindenAccess"
- type="alert">
-You are about to change the access list for a Linden owned estate (mainland, teen grid, orientation, etc.).
-
-This is DANGEROUS and should only be done to invoke the hack allowing objects/[CURRENCY] to be transfered in/out of a grid.
-
-It will change thousands of regions and make the spaceserver hiccup.
+This used to be some Linden inspired crap, but should never be seen now.
+Still unravelling the code before I make this go away.
   <usetemplate
    name="okcancelbuttons"
    notext="Cancel"
@@ -5237,6 +5218,88 @@ The string [STRING_NAME] is missing from strings.xml
 </notification>
 
 <notification
+   icon="alertmodal.tga"
+   name="SetDisplayNameSuccess"
+   type="alert">
+Hi [DISPLAY_NAME]!
+
+Just like in real life, it takes a while for everyone to learn about a new name.  Please allow several days for your name to update in objects, scripts, search, etc.
+  </notification>
+
+  <notification
+ icon="alertmodal.tga"
+ name="SetDisplayNameBlocked"
+ type="alert">
+Sorry, you cannot change your display name. If you feel this is in error, please contact support.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SetDisplayNameFailedLength"
+   type="alertmodal">
+Sorry, that name is too long.  Display names can have a maximum of [LENGTH] characters.
+
+Please try a shorter name.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SetDisplayNameFailedGeneric"
+   type="alertmodal">
+    Sorry, we could not set your display name.  Please try again later.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SetDisplayNameMismatch"
+   type="alertmodal">
+    The display names you entered do not match. Please re-enter.
+  </notification>
+
+  <!-- *NOTE: This should never happen -->
+  <notification
+   icon="alertmodal.tga"
+   name="AgentDisplayNameUpdateThresholdExceeded"
+   type="alertmodal">
+Sorry, you have to wait longer before you can change your display name.
+
+See http://wiki.secondlife.com/wiki/Setting_your_display_name
+
+Please try again later.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AgentDisplayNameSetBlocked"
+   type="alertmodal">
+ Sorry, we could not set your requested name because it contains a banned word.
+ 
+ Please try a different name.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+ name="AgentDisplayNameSetInvalidUnicode"
+ type="alertmodal">
+    The display name you wish to set contains invalid characters.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+ name="AgentDisplayNameSetOnlyPunctuation"
+ type="alertmodal">
+    Your display name must contain letters other than punctuation.
+  </notification>
+
+
+  <notification
+   icon="notifytip.tga"
+   name="DisplayNameUpdate"
+   type="notifytip">
+    [OLD_NAME] ([SLID]) is now known as [NEW_NAME].
+  </notification>
+
+<notification
  icon="notifytip.tga"
  name="Cancelled"
  type="notifytip">
@@ -5657,9 +5720,9 @@ If you want to view streaming media on parcels that support it you should go to
 No Media Plugin was found to handle the "[MIME_TYPE]" mime type.  Media of this type will be unavailable.
 </notification>
 <notification
- icon="alertmodal.tga"
+ icon="alert.tga"
  name="MediaPluginFailed"
- type="alertmodal">
+ type="alert">
 The following Media Plugin has failed:
 [PLUGIN]
 
@@ -6874,7 +6937,7 @@ GRAVITY  --  -9.8
 
 *  --  Multiplication
 \  --  Division
-+  --  Addition
+  --  Addition
 -  --  Subtraction
 
 For information about this feature, click "More Info".
@@ -6903,7 +6966,7 @@ GLOW --  Glow
 
 *  --  Multiplication
 \  --  Division
-+  --  Addition
+  --  Addition
 -  --  Subtraction
 
 For information about this feature, click "More Info".
@@ -7221,6 +7284,24 @@ Apply this region's settings? (&quot;Ignore&quot; will ignore all region setting
 The new font will appear after you restart [VIEWER_NAME].
 </notification>
 
+<notification
+ icon="alertmodal.tga"
+ name="FirstPrivacy"
+ type="alertmodal">
+Terms of service of the grid you are connecting to require sending a "statistics packet" every 5 minutes.
+That is for example: Data about your hardware (CPU, RAM), number of avatars around, number of sims visited.
+Please check *the grids* privacy policy about usage of that data.
+  <form name="form">
+          <button
+                 index="0"
+                 name="ok"
+                 text="Login anyway"/>
+          <button
+                 index="1"
+                 name="notok"
+                 text="Do not log in"/>
+  </form>
+</notification>
 
 <!--End Imprudence notifications-->
  <!-- [KITTY VIEWER] -->
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 38c5a98..2db2595 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
@@ -127,6 +127,11 @@
                              font="SansSerifSmall" height="16" is_unicode="false" left="12"
                              max_length="254" mouse_opaque="false" name="name"
                              width="155" />
+      <name_editor bevel_style="in" border_style="line" visible="false"
+                             border_thickness="1" bottom="-24" enabled="false" follows="left|top"
+                             font="SansSerifSmall" height="16" is_unicode="false" left_delta="0"
+                             max_length="254" mouse_opaque="false" name="complete_name"
+                             width="155" />
       <button bottom_delta="0" font="SansSerif" halign="center" height="20"
            label="Copy Key" label_selected="Copy Key"
            left_delta="157" mouse_opaque="true" name="btn_copy_uuid" width="80" />
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 4b0b292..6ced7d6 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
@@ -2,6 +2,15 @@
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
      height="408" label="General" left="102" mouse_opaque="true"
      name="general_panel" 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="start_location_textbox" v_pad="0" width="394">
+                Start Location:
+        </text>
+        <string name="region_name_prompt">
+                &lt;Type region name&gt;
+        </string>
   <combo_box name="default_location_combo"
              bottom="-22" left="155" height="16" width="150"
              follows="left|top" font="SansSerifSmall"
@@ -24,7 +33,13 @@
        font="SansSerifSmall" height="16" initial_value="true"
        label="Show start location at login screen" left="151" mouse_opaque="true"
        name="show_location_checkbox" radio_style="false" width="256" />
-        <combo_box bottom_delta="-25" follows="left|top" height="18" left="155"
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-24" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+             mouse_opaque="true" name="show_names_textbox" v_pad="0" width="394">
+                Nametags:
+        </text>
+        <combo_box bottom_delta="0" follows="left|top" height="18" left="155"
              mouse_opaque="true" name="fade_out_combobox" width="146">
                 <combo_item name="Never" value="Never">
                         Never show
@@ -44,11 +59,35 @@
              font="SansSerifSmall" height="16" initial_value="false"
              label="Hide my name on my screen" left="151" name="show_my_name_checkbox"
              width="200" />
+
         <check_box bottom_delta="-20" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Highlight friends tags" left="151" name="highlight_friends_checkbox"
              width="200" />
         <text type="string" length="1" bottom_delta="-24" follows="left|top" font="SansSerifSmall" h_pad="0"
+             halign="left" height="16" left="10" name="Display_Names_textbox" v_pad="0"
+             width="394">
+                Display Names:
+        </text>
+        <radio_group name="displaynames" draw_border="false"
+               bottom_delta="0" left_delta="60" height="18"
+               follows="top|left"
+               control_name="DisplayNamesUsage">
+                <radio_item name="0" bottom_delta="-8" left_delta="40" height="18">
+                Legacy Names
+                </radio_item>
+                <radio_item name="1" bottom_delta="0" left_delta="50" height="18">
+                Display Names
+                </radio_item>
+                <radio_item name="2" bottom_delta="0" left_delta="50" height="18">
+                Show Both
+                </radio_item>
+        </radio_group>
+        <check_box bottom_delta="-20" follows="left|top" control_name="LegacyNamesForFriends"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Show legacy names for friends" left="151" name="legacy_friends_checkbox"
+             width="200" />
+        <text type="string" length="1" bottom_delta="-24" follows="left|top" font="SansSerifSmall" h_pad="0"
              halign="left" height="16" left="10" name="group_titles_textbox" v_pad="0"
              width="394">
                 Group Titles:
@@ -61,37 +100,49 @@
              font="SansSerifSmall" height="16" initial_value="false"
              label="Hide my group title" left="330" name="show_my_title_checkbox"
              radio_style="false" width="256" />
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-210"
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-24" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+             mouse_opaque="true" name="effects_color_textbox" v_pad="0" width="394">
+                Selection Beam Color:
+        </text>
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-44"
              can_apply_immediately="false" color="1 1 1 1"
-             enabled="true" follows="left|top" height="65" label="" left="153"
+             enabled="true" follows="left|top" height="55" label="" left="153"
              mouse_opaque="true" name="effect_color_swatch"
-             tool_tip="Click to open Color Picker" width="55" />
+             tool_tip="Click to open Color Picker" width="45" />
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-215" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
              mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
     UI Size:
   </text>
-  <slider bottom="-217" can_edit_text="true"
+  <slider bottom_delta="42" can_edit_text="true"
              decimal_digits="3" enabled="true" height="16" increment="0.001"
              initial_val="1" left="148" max_val="1.4" min_val="0.75" mouse_opaque="true"
              name="ui_scale_slider" show_text="true" value="1" width="220" />
-  <button bottom="-221" enabled="true" follows="left|top"
+  <button bottom_delta="-48" enabled="true" follows="left|top"
              font="SansSerif" halign="center" height="22" label="Reset"
              label_selected="Reset" left_delta="226" mouse_opaque="true"
              name="reset_ui_size" scale_image="true" width="80" />
-  <check_box bottom="-236" enabled="true" follows="left|top"
+  <check_box bottom_delta="-14" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Use resolution independent scale" left="151" mouse_opaque="true"
              name="ui_auto_scale" radio_style="false" width="256" />
-  <check_box bottom="-260" enabled="true" follows="left|top"
-                   font="SansSerifSmall" height="16" initial_value="false"
-                   label="Go Away/AFK when idle" left="330" mouse_opaque="true"
-                   name="afk_timeout_checkbox" radio_style="false" width="256" />
-  <spinner bottom="-260" decimal_digits="0" enabled="true"
+  <spinner bottom_delta="-24" decimal_digits="0" enabled="true"
              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" />
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="6" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="220"
+             mouse_opaque="true" name="seconds_textbox" v_pad="0" width="128">
+                seconds
+        </text>
+    <check_box bottom_delta="-5" enabled="true" follows="left|top"
+                   font="SansSerifSmall" height="16" initial_value="false"
+                   label="Go Away/AFK when idle" left="330" mouse_opaque="true"
+                   name="afk_timeout_checkbox" radio_style="false" width="256" />
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
        bottom_delta="-27" drop_shadow_visible="true" enabled="true" follows="left|top"
        font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
@@ -109,18 +160,18 @@
        mouse_opaque="true" name="mini_map_notify_sim" radio_style="false"
        width="256" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-312" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="-24" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
              mouse_opaque="true" name="maturity_desired_label" v_pad="0" width="394">
                  Rating:
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-312" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="151"
              mouse_opaque="true" name="maturity_desired_prompt" v_pad="0" width="394">
                  I want to access content rated:
         </text>
-        <combo_box bottom="-318" follows="left|top" height="18" left="315"
+        <combo_box bottom_delta="-6" follows="left|top" height="18" left="315"
              mouse_opaque="true" name="maturity_desired_combobox" width="150">
                 <combo_item name="Desired_Adult" value="42">
                         PG, Mature and Adult
@@ -133,58 +184,20 @@
                 </combo_item>
         </combo_box>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-312" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="315"
              mouse_opaque="true" name="maturity_desired_textbox" v_pad="0" width="150">
                  PG only
         </text>
+
+
         <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="start_location_textbox" v_pad="0" width="394">
-                Start Location:
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-64" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-             mouse_opaque="true" name="show_names_textbox" v_pad="0" width="394">
-                Nametags:
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-155" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-             mouse_opaque="true" name="effects_color_textbox" v_pad="0" width="394">
-                Selection Beam Color:
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-254" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="220"
-             mouse_opaque="true" name="seconds_textbox" v_pad="0" width="128">
-                seconds
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-352" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="-24" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
              mouse_opaque="true" name="time_textbox" v_pad="0" width="394">
                 Clock:
         </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             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:
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-1" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="18" left_delta="293" mouse_opaque="true" name="language_textbox2"
-             v_pad="0" width="400">
-                (requires restart for full effect)
-        </text>
-        <string name="region_name_prompt">
-                &lt;Type region name&gt;
-        </string>
-        <combo_box allow_text_entry="false" bottom="-352" enabled="true" follows="left|top"
+        <combo_box allow_text_entry="false" bottom_delta="0" enabled="true" follows="left|top"
              height="18" left="153" max_chars="20" mouse_opaque="true"
              name="time_combobox" width="146">
                 <combo_item type="string" name="12HourTime" value="PST 12">
@@ -197,7 +210,13 @@
                         UTC
                 </combo_item>
         </combo_box>
-        <combo_box allow_text_entry="true" bottom="-382" enabled="true"
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-24" 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:
+        </text>
+        <combo_box allow_text_entry="true" bottom_delta="0" enabled="true"
              follows="left|top" 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">
@@ -255,5 +274,11 @@
                         한국어 (Korean) - Beta
                 </combo_item>
         </combo_box>
-
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="0" drop_shadow_visible="true" enabled="true"
+             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+             height="18" left_delta="150" mouse_opaque="true" name="language_textbox2"
+             v_pad="0" width="400">
+                (requires restart for full effect)
+        </text>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/es/notifications.xml b/linden/indra/newview/skins/default/xui/es/notifications.xml
index f39dfc9..f3a862d 100644
--- a/linden/indra/newview/skins/default/xui/es/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/es/notifications.xml
@@ -1454,21 +1454,6 @@ Se ocultará el chat y los mensajes instantáneos. Los mensajes instantáneos re
                         <button name="Cancel" text="Cancelar"/>
                 </form>
         </notification>
-        <notification label="Cambiar un estado Linden" name="ChangeLindenEstate">
-                Va a hacer cambios en un estado propiedad de Linden (mainland, grid teen, orientación, etc.).
-
-Esto es EXTREMADAMENTE PELIGROSO, porque puede afectar radicalmente al funcionamiento de los usuarios. En mainland, se cambiarán miles de regiones, y se provocará un colapso en el espacio del servidor.
-
-¿Proceder?
-                <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
-        </notification>
-        <notification label="Cambiar el acceso a un estado Linden" name="ChangeLindenAccess">
-                Va a cambiar la lista de acceso de un estado propiedad de Linden (mainland, grid teen, orientación, etc.).
-
-Esto es PELIGROSO, y sólo debe hacerse para deshacerse de ataques que permitan sacar o meter en el grid objetos o L$.
-Se cambiarán miles de regiones, y se provocará un colapso en el espacio del servidor.
-                <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
-        </notification>
         <notification label="Seleccionar el estado" name="EstateAllowedAgentAdd">
                 ¿Añadir a la lista de permitidos sólo para este estado o para [ALL_ESTATES]?
                 <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos los estados" yestext="Este estado"/>
diff --git a/linden/indra/newview/skins/default/xui/fr/notifications.xml b/linden/indra/newview/skins/default/xui/fr/notifications.xml
index 6911f8b..dc7e61f 100644
--- a/linden/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/fr/notifications.xml
@@ -1425,21 +1425,6 @@ Pour quitter un groupe, sélectionnez l&apos;option Groupe dans le menu Éditer.
                         <button name="Cancel" text="Annuler"/>
                 </form>
         </notification>
-        <notification label="Modifier un domaine Linden" name="ChangeLindenEstate">
-                Vous vous apprêtez à modifier un domaine appartenant aux Lindens (continent, zone réservée aux ados, orientation etc.).
-
-Cela est extrêmement délicat car l&apos;expérience des résidents est en jeu. Sur le continent, cela modifiera des milliers de régions et sera difficile à digérer pour le serveur.
-
-Continuer ?
-                <usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-        </notification>
-        <notification label="Modifier l&apos;accès à un domaine Linden" name="ChangeLindenAccess">
-                Vous vous apprêtez à modifier la liste d&apos;accès à un domaine appartenant aux Linden (continent, zone réservée aux ados, orientation etc.).
-
-Cette action est délicate et ne doit être effectuée que pour appeler le hack autorisant des objets/L$ à être transférés à l&apos;intérieur/extérieur de la grille.
-Cette action modifiera des milliers de régions et sera difficile à digérer pour le serveur.
-                <usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-        </notification>
         <notification label="Choisir le domaine" name="EstateAllowedAgentAdd">
                 Ajouter à la liste des résidents autorisés uniquement pour ce domaine ou pour [ALL_ESTATES] ?
                 <usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Tous les domaines" yestext="Ce domaine"/>
diff --git a/linden/indra/newview/skins/default/xui/hu/notifications.xml b/linden/indra/newview/skins/default/xui/hu/notifications.xml
index bf41284..6bc188d 100644
--- a/linden/indra/newview/skins/default/xui/hu/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/hu/notifications.xml
@@ -1317,19 +1317,6 @@ A csoportból való kilépéshez válaszd a &apos;Csoportok...&apos; részt a &a
         <notification label="Üzenetküldés mindenki számára a telkeden" name="MessageEstate">
                 Rövid bejelentés írása, amely elküldésre mindenki részére, aki az ingatlanodon tartózkodik.
         </notification>
-        <notification label="Linden telek változtatása" name="ChangeLindenEstate">
-                Linden tulajdonú telek változtatása folyamatban (mainland, teen grid, orientation, stb.).
-
-Ez NAGYON VESZÉLYES, mivel kihatással van a felhasználók megszokásaira. A mainland-en ez régiók ezreit befolyásolja, amely a &apos;spaceserver&apos; működésében akadályokat okoz.
-
-Folytatod?
-        </notification>
-        <notification label="Linden telek belépésének változtatása" name="ChangeLindenAccess">
-                Linden tulajdonú telek változtatása folyamatban (mainland, teen grid, orientation, stb.).
-
-This is DANGEROUS and should only be done to invoke the hack allowing objects/L$ to be transfered in/out of a grid.
-A mainland-en ez régiók ezreit befolyásolja, amely a &apos;spaceserver&apos; működésében akadályokat okoz.
-        </notification>
         <notification label="Ingatlan kiválasztása" name="EstateAllowedAgentAdd">
                 Engedélyezettek listájához való hozzáadása csak ennek az ingatlan vagy [ALL_ESTATES] esetén?
         </notification>
diff --git a/linden/indra/newview/skins/default/xui/it/notifications.xml b/linden/indra/newview/skins/default/xui/it/notifications.xml
index 61aafae..039a6d1 100644
--- a/linden/indra/newview/skins/default/xui/it/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/it/notifications.xml
@@ -1452,21 +1452,6 @@ Per abbandonare un gruppo seleziona l&apos;opzione &apos;Gruppi..&apos; dal menu
                         <button name="Cancel" text="Annulla"/>
                 </form>
         </notification>
-        <notification label="Cambia la tipologia della proprietà Linden" name="ChangeLindenEstate">
-                Stai per cambiare la tipologia della proprietà Linden (mainland, griglia minorenni, orientamento, ecc.).
-
-Questo è ESTREMAMENTE PERICOLOSO perchè può cambiare radicalmente l&apos;esperienza degli utenti.  Sulla mainland cambierà migliaia di regioni e produrrà seri problemi ai vari server.
-
-Confermi?
-                <usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
-        </notification>
-        <notification label="Cambia la tipologia Linden di accesso alla proprietà" name="ChangeLindenAccess">
-                Stai per cambiare la lista di accesso per una proprietà Linden (mainland, griglia minorenni, orientamento, ecc.).
-
-Questo è PERICOLOSO e dovrebbe essere fatto soltanto per poter lanciare il programma che consente agli oggetti/L$ di essere trasferiti fra griglie diverse.
-Cambierà migliaia di regioni e produrrà seri problemi ai vari server.
-                <usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
-        </notification>
         <notification label="Seleziona la proprietà" name="EstateAllowedAgentAdd">
                 Aggiungi alla lista di accesso solo per questa proprietà oppure per [ALL_ESTATES]?
                 <usetemplate canceltext="Annulla" name="yesnocancelbuttons" notext="Tutte le proprietà" yestext="Questa proprietà"/>
diff --git a/linden/indra/newview/skins/default/xui/ja/notifications.xml b/linden/indra/newview/skins/default/xui/ja/notifications.xml
index 6da6ccc..fa63cf0 100644
--- a/linden/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/ja/notifications.xml
@@ -1526,21 +1526,6 @@ F1キーを押してください。
                         <button name="Cancel" text="取り消し"/>
                 </form>
         </notification>
-        <notification label="Lindenの不動産を変更" name="ChangeLindenEstate">
-                あなたはLinden所有の不動産（メインランド、ティーングリッド、オリエンテーションなど）を変更しようとしています。
-
-これはユーザーの経験を根本から揺るがしかねない「非常に危険な行為」です。これにより、メインランドで多数の地域が変更され、スペースサーバーに悪影響が生じます。
-
-操作を続行しますか？
-                <usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-        </notification>
-        <notification label="Lindenの不動産へのアクセスを変更" name="ChangeLindenAccess">
-                あなたはLinden所有の不動産（メインランド、ティーングリッド、オリエンテーションなど）へのアクセスリストを変更しようとしています。
-
-この行為は「危険」であり、グリッドからオブジェクトやお金の転送をもたらすハッキングを引き起こす可能性があるため、完全にそれを意図した場合のみ行うべきものです。
-これにより多数の地域が変更され、スペースサーバーに悪影響が生じます。
-                <usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-        </notification>
         <notification label="不動産を選択" name="EstateAllowedAgentAdd">
                 この不動産の許可リストだけに追加しますか？ それとも[ALL_ESTATES]のすべての許可リストに追加しますか？
                 <usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
diff --git a/linden/indra/newview/skins/default/xui/ko/notifications.xml b/linden/indra/newview/skins/default/xui/ko/notifications.xml
index cb720ed..20c57a1 100644
--- a/linden/indra/newview/skins/default/xui/ko/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/ko/notifications.xml
@@ -2941,43 +2941,7 @@ Applications 폴더에 다운로드하시겠습니까?
     </form>
   </notification>
 
-  <notification
-   
-   label="린든 사유지 변경"
-   name="ChangeLindenEstate"
-   >
-귀하께서는 린든 소유의 사유지(메인랜드, 틴 그리드, 오리엔테이션 등)를
-변경하려고 합니다.
-
-이렇게 하면 기본적으로 사용자가 게임을 즐기는 데 영향을
-줄 수 있으므로 매우 위험합니다.  또한 메인랜드에서 수천가지의 지역이 변경되고
-공간 서버가 일시적으로 중단될 수도 있습니다.
-
-계속하시겠습니까?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="취소"
-     yestext="사유지 변경"/>
-  </notification>
 
-  <notification
-   
-   label="린든 사유지 액세스 변경"
-   name="ChangeLindenAccess"
-   >
-귀하께서는 린든 소유의 사유지(메인랜드, 틴 그리드, 오리엔테이션 등)에 대한
-접근 목록을 변경하려고 합니다.
-
-이는 위험한 작업이며 오브젝트/금액을 그리드에서 송수신할 수 있도록
-핵을 불러내는 경우에만 수행할 수
-있습니다.
-이렇게 하면 수천가지의 지역이 변경되고
-공간 서버가 일시적으로 중단될 수도 있습니다.
-    <usetemplate
-     name="okcancelbuttons"
-     notext="취소"
-     yestext="사유지 변경"/>
-  </notification>
 
   <notification
    
diff --git a/linden/indra/newview/skins/default/xui/pl/notifications.xml b/linden/indra/newview/skins/default/xui/pl/notifications.xml
index 38a4b56..4c8ee5c 100644
--- a/linden/indra/newview/skins/default/xui/pl/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/pl/notifications.xml
@@ -1434,23 +1434,6 @@ Musisz opuścić przynajmniej jedną grupę żeby przyjąć członkostwo w tej g
                         <button name="Cancel" text="Anuluj"/>
                 </form>
         </notification>
-        <notification label="Zmiana Majątku Lindenów" name="ChangeLindenEstate">
-                Dokonujesz zmiany w Regionie Głównym należącym do Lindenów (Regiony Główne, Teen Grid, Orientacja).
-                
-Żądana operacja jest wyjątkowo niebezpieczna dla wszystkich Rezydentów przebywających w regionie. Dodatkowo, zmiany dokonane w Regionie Głównym mogą spowodować problemy przestrzeni serwerowej innych regionów.
-
-Kontynuować?
-                <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
-        </notification>
-        <notification label="Zmiana Dostępu do Majątku Lindenów" name="ChangeLindenAccess">
-                Dokonujesz zmiany w liście dostępu Regionu Głównego należącego do Lindenów (Regiony Główne, Teen Grid, Orientacja).
-
-Żądana operacja jest wyjątkowo niebezpieczna dla wszystkich Rezydentów przebywających w regionie i powinna być używana wyłącznie w celu zablokowania opcji pozwalającej na przeniesienie obiektów/L$ do/z sieci.
-Dodatkowo, zmiany dokonane w Regionie Głównym mogą spowodować problemy przestrzeni serwerowej innych regionów.
-
-Kontynuować?
-                <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
-        </notification>
         <notification label="Wybierz Majątek" name="EstateAllowedAgentAdd">
                 Dodać do listy dostępu do tego majątku czy do [ALL_ESTATES]?
                 <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Wszystkie majątki" yestext="Ten majątek"/>
diff --git a/linden/indra/newview/skins/default/xui/pt/notifications.xml b/linden/indra/newview/skins/default/xui/pt/notifications.xml
index 71903c1..a026c59 100644
--- a/linden/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/pt/notifications.xml
@@ -1434,21 +1434,6 @@ Bate-papo e mensagens instantâneas serão escondidas. Mensagens instantâneas i
                         <button name="Cancel" text="Cancelar"/>
                 </form>
         </notification>
-        <notification label="Mudar propriedade Linden" name="ChangeLindenEstate">
-                Você está prestes a mudar uma propriedade pertencente a Linden (continente, teen grid, orientação, etc.)
-
-Isto é EXTREMAMENTE PERIGOSO porque pode fundamentalmente afetar a experiência do usuário. No continente, vai mudar milhares de regiões e fazer o spaceserver soluçar.
-
-Proceder?
-                <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Mudar Propriedade"/>
-        </notification>
-        <notification label="Mudar o acesso à propriedade Linden" name="ChangeLindenAccess">
-                Você está prestes a mudar a lista de acessos de uma propriedade pertencente a Linden (continente, teen grid, orientação, etc.).
-
-Isto é PERIGOSO e deveria ser feito apenas para utilizar uma brecha que permita que objetos/L$ sejam transferidos para dentro/fora da grade.
-Isto mudará milhares de regiões e fará o spaceserver soluçar.
-                <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
-        </notification>
         <notification label="Selecione a propriedade" name="EstateAllowedAgentAdd">
                 Adicionar à lista de permitidos somente para esta propriedade ou para [ALL_ESTATES]?
                 <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todas as Propriedades" yestext="Esta Propriedade"/>
diff --git a/linden/indra/newview/skins/default/xui/ru/notifications.xml b/linden/indra/newview/skins/default/xui/ru/notifications.xml
index 0d36371..e0f7740 100644
--- a/linden/indra/newview/skins/default/xui/ru/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/ru/notifications.xml
@@ -1452,21 +1452,6 @@ www.secondlife.com/support
                         <button name="Cancel" text="Отмена"/>
                 </form>
         </notification>
-        <notification label="Изменить участок Линденов" name="ChangeLindenEstate">
-                Вы хотите сменить поместья, принадлежащие Линденам (материк, детский Grid, остров ориентации и т.д.).
-
-Это ЧРЕЗВЫЧАЙНО ОПАСНО, потому что это может существенно повлиять на положение вещей. На материке это может изменить тысячи регионов, и испортить работу серверов.
-
-Продолжить?
-                <usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
-        </notification>
-        <notification label="Изменить доступ к участку Линденов" name="ChangeLindenAccess">
-                Вы хотите сменить поместья, принадлежащие Линденам (материк, детский Grid, остров ориентации и т.д.).
-
-Это ЧРЕЗВЫЧАЙНО ОПАСНО и может использоватся только для того, чтобы вызвать методы, позволяющие перемещать объекты/L$ в/из Grid.
-Это может изменить тысячи регионов, и испортить работу серверов.
-                <usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
-        </notification>
         <notification label="Выбрать поместье" name="EstateAllowedAgentAdd">
                 Добавить в список разрешенных этого поместья или [ALL_ESTATES]?
                 <usetemplate canceltext="Отмена" name="yesnocancelbuttons" notext="Все поместья" yestext="Это поместье"/>
diff --git a/linden/indra/newview/skins/default/xui/uk/notifications.xml b/linden/indra/newview/skins/default/xui/uk/notifications.xml
index c7457b3..d207d02 100644
--- a/linden/indra/newview/skins/default/xui/uk/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/uk/notifications.xml
@@ -1436,21 +1436,6 @@ www.secondlife.com/support
                         <button name="Cancel" text="Відміна"/>
                 </form>
         </notification>
-        <notification label="Змінити ділянку Лінденів" name="ChangeLindenEstate">
-                Ви хочете змінити маєтки, що належать Лінденам (материк, дитячий Grid, остров орієнтації і т.д.).
-
-Це НАДЗВИЧАЙНО НЕБЕЗПЕЧНО, тому що це може суттєво вплинути на стан речей. На материку це може змінити тисячі регіонів, і зіпсувати роботу серверів.
-
-Продовжити?
-                <usetemplate name="okcancelbuttons" notext="Відміна" yestext="OK"/>
-        </notification>
-        <notification label="Змінити доступ до ділянки Лінденів" name="ChangeLindenAccess">
-                Ви хочете змінити маєтки, що належать Лінденам (материк, дитячий Grid, остров орієнтації і т.д.).
-
-Це НАДЗВИЧАЙНО НЕБЕЗПЕЧНО і може використовуватися тільки для того, щоб викликати методи, що дозволять переміщати об&apos;єкти/L$ в/з Grid.
-Це може змінити тисячі регіонів, і зіпсувати роботу серверів.
-                <usetemplate name="okcancelbuttons" notext="Відміна" yestext="OK"/>
-        </notification>
         <notification label="Обрати маєток" name="EstateAllowedAgentAdd">
                 Додати в список дозволених цього маєтку або [ALL_ESTATES]?
                 <usetemplate canceltext="Відміна" name="yesnocancelbuttons" notext="Всі маєтки" yestext="Цей маєток"/>
diff --git a/linden/indra/newview/skins/default/xui/zh/notifications.xml b/linden/indra/newview/skins/default/xui/zh/notifications.xml
index acbb18b..415e5e7 100644
--- a/linden/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/zh/notifications.xml
@@ -1538,29 +1538,6 @@ www.secondlife.com/support
                         <button name="OK" text="确定"/>
                 </form>
         </notification>
-        <notification label="更改林登地产" name="ChangeLindenEstate">
-                你将要更改林登所有的地产(大陆、
-少年网格、方位岛，等等)。
-
- 这个动作极度危险，因为它可能会在基础的层次上
-影响到用户体验。在大陆上, 它将改变
-上千的区域，并会使空间服务器噎着。
-
-是否继续？
-                <usetemplate name="okcancelbuttons" notext="取消" yestext="更改不动产"/>
-        </notification>
-        <notification label="更改林登地产准入列表" name="ChangeLindenAccess">
-                你将要更改林登所有的地产的准入列表(大陆、
-少年网格、方位岛，等等)。
-
-该操作非常危险， 应该仅在利用把物体/金钱
-转移进或出某个网格的对付活儿 (hack) 时候
-才应该被执行。 它将改变上千的区域，并会
-使空间服务器噎着。
-
-是否继续？
-                <usetemplate name="okcancelbuttons" notext="取消" yestext="更改不动产"/>
-        </notification>
         <notification label="选择地产" name="EstateAllowedAgentAdd">
                 仅列入此地产还是[ALL_ESTATES]的允许名单？
                 <usetemplate canceltext="取消" name="yesnocancelbuttons" notext="所有地产" yestext="该地产"/>