Merged Experimental branch (exp) back into main line (next).

Git thought many files (almost 100) had merge conflicts. But, after resolving the conflicts (which were mostly trivial), almost all the files turned out to be the same as in the exp branch. So, the conflicts are not listed here. Check the diff between commit 244ffe8 and this commit to see what really changed.
author: Jacek Antonelli 2011-05-08 15:13:37 -0500
committer: Jacek Antonelli 2011-05-08 15:50:49 -0500
commit: 7278f0254a3944bd2bcbf1e855fb0d90c3086a27 (patch)
tree: 5d7ecb81ebf1a07482f0a7d3d13acd7f18360c0b /linden/indra/newview/skins/default
parent: Imprudence 1.3.1 released. (diff)
parent: Changed version to Experimental 2011.04.19 (diff)
download: meta-impy-7278f0254a3944bd2bcbf1e855fb0d90c3086a27.zip
meta-impy-7278f0254a3944bd2bcbf1e855fb0d90c3086a27.tar.gz
meta-impy-7278f0254a3944bd2bcbf1e855fb0d90c3086a27.tar.bz2
meta-impy-7278f0254a3944bd2bcbf1e855fb0d90c3086a27.tar.xz
270 files changed, 10079 insertions, 3338 deletions
diff --git a/linden/indra/newview/skins/default/html/en-us/loading-error/index.html b/linden/indra/newview/skins/default/html/en-us/loading-error/index.html
index 71f9c86..37c8405 100644
--- a/linden/indra/newview/skins/default/html/en-us/loading-error/index.html
+++ b/linden/indra/newview/skins/default/html/en-us/loading-error/index.html
@@ -1,14 +1,14 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+                DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>Unable to Connect</title>
+<title>Unable to Connect</title><style>
-<style>
+body {background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:85%;color:#e9f1f8;width:100%;padding:0px;margin:0px;}
-body {background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;width:100%;padding:0px;margin:0px;}
 a {color:#93a9d5;}
 a:active {color:#50607C;text-decoration:underline;}
 a:hover {color:#ff7900;text-decoration:underline;}
-#infobox{position:absolute;top:40%;left:50%;z-index:1;padding:0;width:592px;margin-left:-296px;margin-top:-150px;text-align:center;font-size:1.2em; color:#ccc;}
+#infobox{position:absolute;top:40%;left:50%;z-index:1;padding:0;width:592px;margin-left:-296px;margin-top:-80px;text-align:left;font-size:1.2em; color:#ccc;}
-#infobox #submitbtn {padding:15px 3px 5px 15px;height:28px;width:127px;margin-left:244px;}
+#infobox #submitbtn {height:28px;width:127px;}
 #infobox #submitbtn input {text-transform:capitalize;color:#fff;font-size:1.0em;height:28px;width:127px;border:none;font-weight:normal;background:url(../../btn_purplepill_bg.png) bottom left no-repeat;vertical-align:text-bottom;font-weight:bold;}
 #infobox #submitbtn input:hover.input_over, #login_box #submitbtn input:hover.input_off {color:#fff;border:none;background:url(../../btn_purplepill_bg.png) bottom right no-repeat;}
 #infobox #submitbtn input:active.input_over {color:#fff;border:none;background:url(../../btn_purplepill_bg.png) top left no-repeat;}
@@ -17,16 +17,34 @@ a:hover {color:#ff7900;text-decoration:underline;}
 </head>
 <body>
 <div id="infobox">
-        <img src="../../unabletoconnect.png"><br/>
+      <table>
-                <p>
-                        Second Life can't establish a connection to the login server.
+      <tbody style="height: 100px; overflow: scroll">
-                </p>
+        <tr>
-                <p>
+            Imprudence can't establish a connection to the login screen of the grid you have chosen.
-                        Please check your internet connection. If your computer or network is protected by a firewall or proxy, make sure that Second Life is permitted to access the network.
+        </tr>
-                </p>
+        <tr>
-                <div id="submitbtn">
+          <td>
-                        <input class="input_over" type="submit" value="Try Again" onclick="document.location='secondlife:///app/login_refresh'; this.className='pressed';" onmouseover="this.className='input_over';" onmouseout="this.className='input_off';" />
+            <img src="../../unabletoconnect.png"><br/>
-                </div>
-        </div>
+          <div id="submitbtn">
+            <input class="input_over" type="submit" value="Try Again" onclick="document.location='secondlife:///app/login_refresh'; this.className='pressed';" onmouseover="this.className='input_over';" onmouseout="this.className='input_off';" />
+           </div>
+          <td>
+            If you are used to see a loginscreen for that grid please
+         <ul>
+          <li>for OpenSimulator grids:  check if the loginuri of that grid is still valid.</li>
+          <li>for OpenSimulator and Second Life: check the grid status page of the grid, and</li>
+          <li>if the grid status page of the grid says online check your internet connection.
+                If your computer or network is protected by a firewall or proxy, make sure that 
+                Imprudence is permitted to access the network</li>
+         </ul>
+         </td>
+        </tr>
+       </tbody>
+      </table>
 </div>
-</body>
-\ No newline at end of file
+</body>
diff --git a/linden/indra/newview/skins/default/textures/textures.xml b/linden/indra/newview/skins/default/textures/textures.xml
index ad1a1b6..60fb4e0 100644
--- a/linden/indra/newview/skins/default/textures/textures.xml
+++ b/linden/indra/newview/skins/default/textures/textures.xml
@@ -16,7 +16,9 @@
  <texture name="toolbar_btn_selected.tga" scale_left="7" scale_top="32" scale_right="121" scale_bottom="0" /> 
  
  <texture name="button_enabled_selected_32x128.tga" preload="true" scale_left="16" scale_top="16" scale_right="112" scale_bottom="16" />
-  
+  <texture name="media_panel_bg.png" preload="true" scale_left="9" scale_top="9" scale_right="9" scale_bottom="9" />
+  <texture name="media_panel_hoverrectangle.png" preload="true" scale_left="9" scale_top="9" scale_right="9" scale_bottom="9" />
  <texture name="checkbox_disabled_false.tga"   preload="true"/>
  <texture name="checkbox_disabled_true.tga"    preload="true"/>
  <texture name="checkbox_enabled_false.tga"    preload="true"/>
@@ -375,4 +377,25 @@
  <texture name="default_land_picture.j2c"/>
  <texture name="default_profile_picture.j2c"/>
  <texture name="locked_image.j2c"/>
+   <!-- Kitty Viewer Art -->
+   <texture name="Inv_WindLight" file_name="Inv_WindLight.png" preload="false" />
+   <texture name="Inv_WaterLight" file_name="Inv_WaterLight.png" preload="false" />
+  <texture name="media_btn_back.png"/>
+  <texture name="media_btn_done.png"/>
+  <texture name="media_btn_forward.png"/>
+  <texture name="media_btn_home.png"/>
+  <texture name="media_btn_newwindow.png"/>
+  <texture name="media_btn_optimalzoom.png"/>
+  <texture name="media_btn_reload.png"/>
+  <texture name="media_btn_scrolldown.png"/>
+  <texture name="media_btn_scrollleft.png"/>
+  <texture name="media_btn_scrollright.png"/>
+  <texture name="media_btn_scrollup.png"/>
+  <texture name="media_btn_stoploading.png"/>
+  <texture name="media_panel_divider.png"/>
+  <texture name="media_panel_scrollbg.png"/>
 </textures>
diff --git a/linden/indra/newview/skins/default/xui/da/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/da/floater_instant_message.xml
index 9b695b5..27dbdcb 100644
--- a/linden/indra/newview/skins/default/xui/da/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/da/floater_instant_message.xml
@@ -33,6 +33,9 @@
        <string name="unavailable_text_label">
                Tekst chat er ikke tilgængeligt i dette opkald.
        </string>
+        <string name="add_friend_string">
+                Tilføj ven
+        </string>
        <flyout_button label="Profil..." name="profile_callee_btn"/>
        <button label="Opkald" name="start_call_btn" pad_right="7" width="120"/>
        <button halign="right" label="Afbryd" name="end_call_btn" width="120"/>
diff --git a/linden/indra/newview/skins/default/xui/da/floater_tools.xml b/linden/indra/newview/skins/default/xui/da/floater_tools.xml
index 0cd5f68..3e47453 100644
--- a/linden/indra/newview/skins/default/xui/da/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/da/floater_tools.xml
@@ -122,8 +122,11 @@
                                Deed
                        </string>
                        <button label="Dedikér..." label_selected="Dedikér..." name="button deed" tool_tip="Gruppedelte genstande kan dedikeres af en gruppeadministrator."/>
-                        <check_box label="Tillad enhver at flytte" name="checkbox allow everyone move"/>
+                        <text name="Anyone can:">
-                        <check_box label="Tillad enhver at kopiére" name="checkbox allow everyone copy"/>
+                                Enhver:
+                        </text>
+                        <check_box label="Flytte" name="checkbox allow everyone move"/>
+                        <check_box label="Kopiére" name="checkbox allow everyone copy"/>
                        <check_box label="Vis i søgning" name="search_check" tool_tip="Lad folk se dette objekt i søgeresultater"/>
                        <check_box label="Til salg" name="checkbox for sale"/>
                        <text name="Cost">
@@ -134,7 +137,7 @@
                                        Original
                                </radio_item>
                                <radio_item name="Copy">
-                                        Kopi
+                                        Kopiére
                                </radio_item>
                                <radio_item name="Contents">
                                        Indhold
@@ -145,7 +148,7 @@
                        </text>
                        <check_box label="Redigére" name="checkbox next owner can modify"/>
                        <check_box label="Kopiére" name="checkbox next owner can copy" left_delta="80"/>
-                        <check_box label="Sælge/Give væk" name="checkbox next owner can transfer" left_delta="67"/>
+                        <check_box label="Sælge/give væk" name="checkbox next owner can transfer" left_delta="67"/>
                        <text name="label click action">
                                Når der venstreklikkes:
                        </text>
diff --git a/linden/indra/newview/skins/default/xui/da/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/da/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/da/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</menu>
diff --git a/linden/indra/newview/skins/default/xui/da/strings.xml b/linden/indra/newview/skins/default/xui/da/strings.xml
index 7a64666..df3d83a 100644
--- a/linden/indra/newview/skins/default/xui/da/strings.xml
+++ b/linden/indra/newview/skins/default/xui/da/strings.xml
@@ -480,7 +480,7 @@
        <string name="xml_file">
                XML Fil
        </string>
-        <string name="dot_raw_file">
+        <string name="raw_file">
                RAW Fil
        </string>
        <string name="compressed_image_files">
diff --git a/linden/indra/newview/skins/default/xui/de/floater_about.xml b/linden/indra/newview/skins/default/xui/de/floater_about.xml
index f7b6e70..de0c20b 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_about.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_about" title="Über Second Life">
        <text name="you_are_at">
-                Sie befinden sich in [POSITION]
+                Sie befinden sich auf [POSITION]
        </text>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_about_land.xml b/linden/indra/newview/skins/default/xui/de/floater_about_land.xml
index 93e7297..4d3d61e 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_about_land.xml
@@ -12,13 +12,13 @@
                                Typ:
                        </text>
                        <text name="LandTypeText">
-                                Mainland / Homestead
+                                Kontinent / Heimstatt
                        </text>
                        <text name="ContentRating">
                                Einstufung:
                        </text>
                        <text name="ContentRatingText">
-                                Adult
+                                Erwachsen
                        </text>
                        <text name="Owner:">
                                Eigentümer:
@@ -31,8 +31,8 @@
                                Gruppe:
                        </text>
                        <button label="Einstellen..." label_selected="Einstellen..." name="Set..."/>
-                        <check_box label="Übertragung an Gruppe zulassen" name="check deed" tool_tip="Ein Gruppen-Officer kann dieses Land der Gruppe übertragen. Das Land wird dann über die Landzuteilung der Gruppe verwaltet."/>
+                        <check_box label="Übertragung an Gruppe zulassen" name="check deed" tool_tip="Ein Gruppen-Offizier kann dieses Land der Gruppe übertragen. Das Land wird dann über die Landzuteilung der Gruppe verwaltet."/>
-                        <button label="Übertragen..." label_selected="Übertragen..." name="Deed..." tool_tip="Sie können Land nur übertragen, wenn Sie in der ausgewählten Gruppe Officer sind."/>
+                        <button label="Übertragen..." label_selected="Übertragen..." name="Deed..." tool_tip="Sie können Land nur übertragen, wenn Sie in der ausgewählten Gruppe Offizier sind."/>
                        <check_box label="Eigentümer leistet Beitrag durch Übertragung" name="check contrib" tool_tip="Wenn das Land an die Gruppe übertragen wird, trägt der frühere Eigentümer ausreichend Landnutzungsrechte bei, um es zu halten."/>
                        <text name="For Sale:">
                                Zum Verkauf:
@@ -41,7 +41,7 @@
                                Nicht zu verkaufen.
                        </text>
                        <text name="For Sale: Price L$[PRICE].">
-                                Preis: [PRICE] L$ ([PRICE_PER_SQM] L$/qm.).
+                                Preis: [PRICE] [CURRENCY] ([PRICE_PER_SQM] [CURRENCY]/qm.).
                        </text>
                        <text name="SalePending"/>
                        <button bottom="-222" label="Land verkaufen..." label_selected="Land verkaufen..." name="Sell Land..."/>
@@ -59,7 +59,7 @@
                                Gekauft am:
                        </text>
                        <text name="DateClaimText">
-                                Dienstag, 15. Aug. 2006, 13:47:25
+                                Die 15. Aug. 13:47:25 2006
                        </text>
                        <text name="PriceLabel">
                                Gebiet:
@@ -75,9 +75,9 @@
                        </text>
                        <button label="Land kaufen..." label_selected="Land kaufen..." name="Buy Land..."/>
                        <button label="Für Gruppe kaufen..." label_selected="Für Gruppe kaufen..." name="Buy For Group..."/>
-                        <button label="Pass kaufen..." label_selected="Pass kaufen..." name="Buy Pass..." tool_tip="Ein Pass gibt Ihnen zeitbegrenzten Zugang zu diesem Land."/>
+                        <button label="Pass kaufen..." label_selected="Pass kaufen..." name="Buy Pass..." tool_tip="Ein Pass gibt Ihnen vorübergehenden Zugang zu diesem Land."/>
                        <button label="Land aufgeben..." label_selected="Land aufgeben..." name="Abandon Land..."/>
-                        <button label="Land in Besitz nehmen..." label_selected="Land in Besitz nehmen..." name="Reclaim Land..."/>
+                        <button label="Land in Rückesitz nehmen..." label_selected="Land in Rückbesitz nehmen..." name="Reclaim Land..."/>
                        <button label="Linden-Verkauf..." label_selected="Linden-Verkauf..." name="Linden Sale..." tool_tip="Land muss Eigentum und auf Inhalt gesetzt sein und nicht zur Auktion stehen."/>
                        <string name="new users only">
                                Nur neue Benutzer
@@ -110,7 +110,7 @@
                                (öffentlich)
                        </string>
                        <string name="none_text">
-                                (keiner)
+                                (niemand)
                        </string>
                        <string name="sale_pending_text">
                                (Wird verkauft)
@@ -128,19 +128,19 @@
                                Name:
                        </text>
                        <text name="estate_name_text">
-                                Mainland
+                                Kontinent
                        </text>
                        <text name="estate_owner_lbl">
                                Eigentümer:
                        </text>
                        <text name="estate_owner_text">
-                                (keiner)
+                                (niemand)
                        </text>
                        <text_editor name="covenant_editor">
                                Für dieses Grundstück fehlt der Vertrag.
                        </text_editor>
                        <text name="covenant_timestamp_text">
-                                Letzte Änderung am Mittwoch, den 31. Dez. 1969, 16:00:00
+                                Letzte Änderung am Mittwoch 31. Dez. 1969, 16:00:00
                        </text>
                        <text name="region_section_lbl">
                                Region:
@@ -155,13 +155,13 @@
                                Typ:
                        </text>
                        <text name="region_landtype_text">
-                                Mainland / Homestead
+                                Kontinent / Heimstatt
                        </text>
                        <text name="region_maturity_lbl">
                                Einstufung:
                        </text>
                        <text name="region_maturity_text">
-                                Adult
+                                Erwachsen
                        </text>
                        <text name="resellable_lbl">
                                Wiederverkauf:
@@ -173,22 +173,22 @@
                                Unterteilen:
                        </text>
                        <text name="changeable_clause">
-                                Land in dieser Region kann nicht zusammengelegt/geteilt
+                                Land in dieser Region kann nicht zusammengelegt/geteilt werden.
-werden.
                        </text>
                        <string name="can_resell">
                                Gekauftes Land in dieser Region kann wiederverkauft werden.
                        </string>
                        <string name="can_not_resell">
-                                Gekauftes Land in dieser Region kann nicht wiederverkauft werden.
+                                Gekauftes Land in dieser Region kann nicht wiederverkauft 
+werden.
                        </string>
                        <string name="can_change">
-                                Gekauftes Land in dieser Region kann zusammengelegt und
+                                Gekauftes Land in dieser Region kann zusammengelegt oder
 geteilt werden.
                        </string>
                        <string name="can_not_change">
-                                Gekauftes Land in dieser Region kann nicht zusammengelegt
+                                Gekauftes Land in dieser Region kann nicht zusammengelegt oder
-und geteilt werden.
+geteilt werden.
                        </string>
                </panel>
                <panel label="Objekte" name="land_objects_panel">
@@ -196,7 +196,7 @@ und geteilt werden.
                                Objektbonusfaktor in Region: [BONUS]
                        </text>
                        <text name="Simulator primitive usage:">
-                                Primitive in Simulator:
+                                Primitiva in Simulator:
                        </text>
                        <text name="objects_available">
                                [COUNT] von [MAX] ([AVAILABLE] verfügbar)
@@ -244,7 +244,7 @@ und geteilt werden.
                        <button label="Anzeigen" label_selected="Anzeigen" name="ShowOther" right="-135" width="60"/>
                        <button label="Zurückgeben..." label_selected="Zurückgeben..." name="ReturnOther..." right="-10" tool_tip="Objekte an ihre Eigentümer zurückgeben." width="119"/>
                        <text left="14" name="Selected / sat upon:" width="140">
-                                Ausgewählt/gesessen auf:
+                                Ausgewählt / gesessen auf:
                        </text>
                        <text left="204" name="selected_objects_text" width="48">
                                [COUNT]
@@ -261,7 +261,7 @@ und geteilt werden.
                        <name_list name="owner list">
                                <column label="Typ" name="type"/>
                                <column label="Name" name="name"/>
-                                <column label="Zählen" name="count"/>
+                                <column label="Anzahl" name="count"/>
                                <column label="Aktuellster" name="mostrecent"/>
                        </name_list>
                </panel>
@@ -269,8 +269,8 @@ und geteilt werden.
                        <text name="allow_label">
                                Anderen Einwohnern gestatten:
                        </text>
-                        <check_box label="Terrain bearbeiten" name="edit land check" tool_tip="Falls aktiviert, kann jeder Ihr Land terraformen. Am besten ist es, wenn Sie diese Option deaktiviert lassen. Sie können Ihr eigenes Land jederzeit bearbeiten."/>
+                        <check_box label="Terrain bearbeiten" name="edit land check" tool_tip="Falls aktiviert, kann jeder Ihr Land terraformen. Am besten ist es, diese Option deaktiviert zu lassen. Sie können Ihr eigenes Land jederzeit bearbeiten."/>
-                        <check_box label="Landmarken erstellen" name="check landmark"/>
+                        <check_box label="Landmarke erstellen" name="check landmark"/>
                        <check_box label="Fliegen" name="check fly" tool_tip="Falls aktiviert, können Einwohner auf Ihrem Land fliegen. Falls nicht aktiviert, können Einwohner lediglich auf Ihr Land fliegen und dort landen (dann jedoch nicht wieder weiterfliegen) oder über Ihr Land hinweg fliegen."/>
                        <text name="allow_label2">
                                Objekte erstellen:
@@ -283,16 +283,16 @@ und geteilt werden.
                        <check_box label="Alle Einwohner" name="all object entry check"/>
                        <check_box label="Gruppe" name="group object entry check"/>
                        <text name="allow_label4">
-                                Skripts ausführen:
+                                Skripte ausführen:
                        </text>
                        <check_box label="Alle Einwohner" name="check other scripts"/>
                        <check_box label="Gruppe" name="check group scripts"/>
                        <text name="land_options_label">
                                Landoptionen:
                        </text>
-                        <check_box label="Sicher (kein Schaden)" name="check safe" tool_tip="Falls aktiviert, wird Land auf Option „Sicher“ eingestellt, Kampfschäden sind deaktiviert. Falls nicht aktiviert, sind Kampfschäden aktiviert."/>
+                        <check_box label="Sicher (kein Schaden)" name="check safe" tool_tip="Falls aktiviert, wird Land auf Option „Sicher“ gestellt, Kampfschäden sind deaktiviert. Falls nicht aktiviert, sind Kampfschäden aktiviert."/>
-                        <check_box label="Kein Stoßen" name="PushRestrictCheck" tool_tip="Verhindert Skripte am Stoßen. Durch Aktivieren dieser Option verhindern Sie störendes Verhalten auf Ihrem Land."/>
+                        <check_box label="Kein Stoßen" name="PushRestrictCheck" tool_tip="Hindert Skripte am Stoßen. Durch Aktivieren dieser Option verhindern Sie störendes Verhalten auf Ihrem Land."/>
-                        <check_box label="Ort in Suche anzeigen (30 L$/Woche) unter" name="ShowDirectoryCheck" tool_tip="Diese Parzelle in Suchergebnissen anzeigen."/>
+                        <check_box label="Ort in Suche anzeigen ([DIRECTORYFEE])  unter" name="ShowDirectoryCheck" tool_tip="Diese Parzelle in Suchergebnissen anzeigen."/>
                        <string name="search_enabled_tooltip">
                                Diese Parzelle in Suchergebnissen anzeigen.
                        </string>
@@ -305,25 +305,25 @@ Nur große Parzellen können in der Suche aufgeführt werden.
                        </string>
                        <combo_box name="land category with adult">
                                <combo_item name="AnyCategory">
-                                        Alle Kategorien
+                                        Jede Kategorie
                                </combo_item>
                                <combo_item name="LindenLocation">
-                                        Lindenort
+                                        Linden Position
                                </combo_item>
                                <combo_item name="Adult">
-                                        Adult
+                                        Erwachsen
                                </combo_item>
                                <combo_item name="Arts&amp;Culture">
                                        Kunst &amp; Kultur
                                </combo_item>
                                <combo_item name="Business">
-                                        Business
+                                        Gewerbe
                                </combo_item>
                                <combo_item name="Educational">
                                        Bildung
                                </combo_item>
                                <combo_item name="Gaming">
-                                        Spielen
+                                        Spiele
                                </combo_item>
                                <combo_item name="Hangout">
                                        Treffpunkt
@@ -332,13 +332,13 @@ Nur große Parzellen können in der Suche aufgeführt werden.
                                        Anfängergerecht
                                </combo_item>
                                <combo_item name="Parks&amp;Nature">
-                                        Parks und Natur
+                                        Parks &amp; Natur
                                </combo_item>
                                <combo_item name="Residential">
                                        Wohngebiet
                                </combo_item>
                                <combo_item name="Shopping">
-                                        Shopping
+                                        Einkaufen
                                </combo_item>
                                <combo_item name="Other">
                                        Sonstige
@@ -346,22 +346,22 @@ Nur große Parzellen können in der Suche aufgeführt werden.
                        </combo_box>
                        <combo_box left="266" name="land category" width="130">
                                <combo_item name="AnyCategory">
-                                        Alle Kategorien
+                                        Jede Kategorie
                                </combo_item>
                                <combo_item name="LindenLocation">
-                                        Lindenort
+                                        Linden Position
                                </combo_item>
                                <combo_item name="Arts&amp;Culture">
-                                        Kunst und Kultur
+                                        Kunst &amp; Kultur
                                </combo_item>
                                <combo_item name="Business">
-                                        Business
+                                        Gewerbe
                                </combo_item>
                                <combo_item name="Educational">
                                        Bildung
                                </combo_item>
                                <combo_item name="Gaming">
-                                        Spielen
+                                        Spiele
                                </combo_item>
                                <combo_item name="Hangout">
                                        Treffpunkt
@@ -370,31 +370,31 @@ Nur große Parzellen können in der Suche aufgeführt werden.
                                        Anfängergerecht
                                </combo_item>
                                <combo_item name="Parks&amp;Nature">
-                                        Parks und Natur
+                                        Parks &amp; Natur
                                </combo_item>
                                <combo_item name="Residential">
                                        Wohngebiet
                                </combo_item>
                                <combo_item name="Shopping">
-                                        Shopping
+                                        Einkaufen
                                </combo_item>
                                <combo_item name="Other">
                                        Sonstige
                                </combo_item>
                        </combo_box>
                        <button label="?" label_selected="?" name="?"/>
-                        <check_box label="Mature-Inhalt" name="MatureCheck" tool_tip=""/>
+                        <check_box label="Reifer Inhalt" name="MatureCheck" tool_tip=""/>
                        <string name="mature_check_mature">
-                                Mature-Inhalt
+                                Reifer Inhalt
                        </string>
                        <string name="mature_check_adult">
-                                Adult-Inhalt
+                                Erwachsenen-Inhalt
                        </string>
                        <string name="mature_check_mature_tooltip">
-                                Die Informationen oder Inhalte Ihrer Parzelle sind „Mature“.
+                                Die Informationen oder Inhalte Ihrer Parzelle sind als „Reif“ klassifiziert.
                        </string>
                        <string name="mature_check_adult_tooltip">
-                                Die Informationen oder Inhalte Ihrer Parzelle sind „Adult“.
+                                Die Informationen oder Inhalte Ihrer Parzelle sind als „Erwachsen“ klassifiziert.
                        </string>
                        <text name="Snapshot:">
                                Foto:
@@ -406,7 +406,7 @@ Nur große Parzellen können in der Suche aufgeführt werden.
                        <string name="landing_point_none">
                                (keiner)
                        </string>
-                        <button label="Festlegen" label_selected="Festlegen" left="234" name="Set" tool_tip="Legt den Landepunkt fest, an dem Besucher ankommen. Legt die Position Ihres Avatars innerhalb dieser Parzelle fest." width="70"/>
+                        <button label="Festlegen" label_selected="Festlegen" left="234" name="Set" tool_tip="Legt den Landepunkt fest, an dem Besucher ankommen. Legt den Punkt auf der Position Ihres Avatars innerhalb dieser Parzelle fest." width="70"/>
                        <button label="Löschen" label_selected="Löschen" left="312" name="Clear" tool_tip="Landepunkt löschen." width="70"/>
                        <text name="Teleport Routing: ">
                                Teleport-Route:
@@ -433,7 +433,7 @@ Nur große Parzellen können in der Suche aufgeführt werden.
                        <text name="with media:">
                                Medientyp:
                        </text>
-                        <combo_box name="media type" tool_tip="Geben Sie einen URL für den Film, die Webseite oder ein anderes Medium ein"/>
+                        <combo_box name="media type" tool_tip="Geben Sie ein, ob die URL für einen Film, eine Webseite oder ein anderes Medium ist"/>
                        <text name="at URL:">
                                Medien-URL:
                        </text>
@@ -496,7 +496,7 @@ Optionen:
                                Eine oder mehrere dieser Optionen gelten auf Grundstücksebene
                        </string>
                        <check_box label="Gruppenzugang erlauben: [GROUP]" name="GroupCheck" tool_tip="Gruppe im Register „Allgemein“ festlegen."/>
-                        <check_box label="Pässe verkaufen an:" name="PassCheck" tool_tip="Ermöglicht befristeten Zugang zu dieser Parzelle"/>
+                        <check_box label="Pässe verkaufen an:" name="PassCheck" tool_tip="Ermöglicht verübergehenden Zugang zu dieser Parzelle"/>
                        <combo_box name="pass_combo">
                                <combo_item name="Anyone">
                                        Jeden
@@ -505,18 +505,18 @@ Optionen:
                                        Gruppe
                                </combo_item>
                        </combo_box>
-                        <spinner label="Preis in L$:" name="PriceSpin"/>
+                        <spinner label="Preis in [CURRENCY]:" name="PriceSpin"/>
-                        <spinner label="Online-Zeit:" name="HoursSpin"/>
+                        <spinner label="Zugangs-Zeiten:" name="HoursSpin"/>
                        <text label="Immer erlauben" name="AllowedText">
                                Zulässige Einwohner
                        </text>
-                        <name_list name="AccessList" tool_tip="([LISTED] angezeigt, max. [MAX])"/>
+                        <name_list name="AccessList" tool_tip="([LISTED] angezeigt, [MAX] max.)"/>
                        <button label="Hinzufügen..." label_selected="Hinzufügen..." name="add_allowed"/>
                        <button label="Entfernen" label_selected="Entfernen" name="remove_allowed"/>
                        <text label="Verbannen" name="BanCheck">
                                Verbannte Einwohner
                        </text>
-                        <name_list name="BannedList" tool_tip="([LISTED] angezeigt, max. [MAX])"/>
+                        <name_list name="BannedList" tool_tip="([LISTED] angezeigt, [MAX] max.)"/>
                        <button label="Hinzufügen..." label_selected="Hinzufügen..." name="add_banned"/>
                        <button label="Entfernen" label_selected="Entfernen" name="remove_banned"/>
                </panel>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_animation_preview.xml b/linden/indra/newview/skins/default/xui/de/floater_animation_preview.xml
index 299b6a7..d25a031 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_animation_preview.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_animation_preview.xml
@@ -14,7 +14,7 @@
        <text name="hand_label">
                Handhaltung
        </text>
-        <combo_box label="" name="hand_pose_combo" tool_tip="Steuert während der Animation die Bewegung der Hände.">
+        <combo_box label="" name="hand_pose_combo" tool_tip="Steuert die Bewegung der Hände während der Animation.">
                <combo_item name="Spread">
                        Dehnen
                </combo_item>
@@ -22,7 +22,7 @@
                        Entspannt
                </combo_item>
                <combo_item name="PointBoth">
-                        Beide zeigen
+                        Beide zeigend
                </combo_item>
                <combo_item name="Fist">
                        Faust
@@ -31,7 +31,7 @@
                        Links entspannt
                </combo_item>
                <combo_item name="PointLeft">
-                        Nach links zeigen
+                        Links zeigend
                </combo_item>
                <combo_item name="FistLeft">
                        Linke Faust
@@ -40,7 +40,7 @@
                        Rechts entspannt
                </combo_item>
                <combo_item name="PointRight">
-                        Nach rechts zeigen
+                        Rechts zeigend
                </combo_item>
                <combo_item name="FistRight">
                        Rechte Faust
@@ -52,7 +52,7 @@
                        Tippt
                </combo_item>
                <combo_item name="PeaceRight">
-                        Friedensrecht
+                        Friedenszeichen rechts
                </combo_item>
        </combo_box>
        <text name="emote_label">
@@ -72,7 +72,7 @@
                        Verärgert
                </combo_item>
                <combo_item name="BigSmile">
-                        Grinst
+                        Grinsen
                </combo_item>
                <combo_item name="Bored">
                        Gelangweilt
@@ -99,7 +99,7 @@
                        Bäääh
                </combo_item>
                <combo_item name="Repulsed">
-                        Zurückgestoßen
+                        Abgestoen
                </combo_item>
                <combo_item name="Sad">
                        Traurig
@@ -128,27 +128,27 @@
                        Stehend
                </combo_item>
                <combo_item name="Walking">
-                        Geht
+                        Gehend
                </combo_item>
                <combo_item name="Sitting">
-                        Sitzt
+                        Sitzend
                </combo_item>
                <combo_item name="Flying">
                        Fliegend
                </combo_item>
        </combo_box>
-        <spinner label="Eingang glätten (s)" label_width="105" name="ease_in_time" tool_tip="Einblendungsgeschwindigkeit von Animationen (in Sekunden)." width="175"/>
+        <spinner label="Einblenden (s)" label_width="105" name="ease_in_time" tool_tip="Einblendungsgeschwindigkeit von Animationen (in Sekunden)." width="175"/>
-        <spinner bottom_delta="-20" label="Ausgang glätten (s)" label_width="105" left="10" name="ease_out_time" tool_tip="Ausblendungsgeschwindigkeit von Animationen (in Sekunden)." width="175"/>
+        <spinner bottom_delta="-20" label="Ausblenden (s)" label_width="105" left="10" name="ease_out_time" tool_tip="Ausblendungsgeschwindigkeit von Animationen (in Sekunden)." width="175"/>
-        <button bottom_delta="-32" label="" name="play_btn" tool_tip="Animation stoppen/wiedergeben."/>
+        <button bottom_delta="-32" label="" name="play_btn" tool_tip="Animation wiedergeben/anhalten."/>
-        <button label="" name="stop_btn" tool_tip="Animation anhalten"/>
+        <button label="" name="stop_btn" tool_tip="Animation stoppen."/>
        <slider label="" name="playback_slider"/>
        <text name="bad_animation_text">
                Animationsdatei konnte nicht gelesen werden.
-Wir empfehlen exportierte BVH-Dateien aus Poser 4.
+Wir empfehlen aus Poser 4 exportierte BVH-Dateien.
        </text>
        <button label="Abbrechen" name="cancel_btn"/>
-        <button label="Hochladen ([AMOUNT] L$)" name="ok_btn"/>
+        <button label="Hochladen ([UPLOADFEE])" name="ok_btn"/>
        <string name="failed_to_initialize">
                Bewegung konnte nicht initialisiert werden
        </string>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_ao.xml b/linden/indra/newview/skins/default/xui/de/floater_ao.xml
index c0731ea..f080bb2 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_ao.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_ao.xml
@@ -2,28 +2,28 @@
 <floater name="geminifloater" title="Animation Overrider">
  <view_border name="ao_notecard"/>
  <view_border name="ao_notecard_vis"/>
-  <text name="Give inventory" tool_tip="ZHAO Notiz hier fallen lassen. Konfiguration und Animationen müssen im gleichen Inventar Ordner liegen!">
+  <text name="Give inventory" tool_tip="ZHAO Notiz hier einstellen. Konfiguration und Animationen müssen im gleichen Inventar-Ordner liegen!">
-    ZHAO II Konfiguration hier fallen lassen.
+    ZHAO II Konfiguration hier einstellen.
  </text>
  <view_border name="ao_notecard_disp"/>
  <text name="ao_nc_text" tool_tip="">
-    Aktuell: ITEM
+    Aktuell festgesetzt: ITEM
  </text>
-  <button name="opencard" label="Laden"/>
+  <button name="opencard" label="Ansehen"/>
  <button name="reloadcard" label="Neuladen"/>
        <button label="Mehr &gt;&gt;" name="more_btn" tool_tip="Erweiterte Optionen"/>
        <button label="&lt;&lt; Weniger" name="less_btn" tool_tip="Erweiterte Optionen"/>
-        <check_box label="Anims übersteuern" name="EmeraldAOEnabled"/>
+        <check_box label="Aktivierung Animationsüberlagerung" name="EmeraldAOEnabled"/>
-  <check_box label="Sitzen übersteuern" name="EmeraldAOSitsEnabled"/>
+  <check_box label="Aktivierung Sitzüberlagerung" name="EmeraldAOSitsEnabled"/>
  <text name="buttons_desc">
-    Stand:
+    Stände:
  </text>
  <combo_box name="stands" label=""/>
  <button name="prevstand" tool_tip="vorheriger Stand" label="&lt;&lt;"/>
  <button name="nextstand" tool_tip="nächster Stand" label="&gt;&gt;"/>
-  <check_box label="zufällige Stand Ani" name="EmeraldAOStandRandomize"/>
+  <check_box label="zufällige Stand-Ani" name="EmeraldAOStandRandomize"/>
-  <check_box label="keine Stand Ani bei Mouselook" name="EmeraldAONoStandsInMouselook"/>
+  <check_box label="keine Stand-Ani bei Mouselook" name="EmeraldAONoStandsInMouselook"/>
-  <spinner name="standtime" label="Stand Zeit" tool_tip="AO Stand zeit in Sekunden"/>
+  <spinner name="standtime" label="Zeit je Stand" tool_tip="AO Standzeit in Sekunden"/>
  <tab_container label="Default" name="tabcontainer">
    <panel label="Standard Anis" name="tabdefaultanims">
      <text name="textdefaultwalk">
@@ -39,7 +39,7 @@
      </text>
      <combo_box name="jumps" label=""/>
      <text name="textdefaultsit">
-        Standard sitzen:
+        Standard Sitz:
      </text>
      <combo_box name="sits" label=""/>
      <text name="textdefaultgsit">
@@ -47,19 +47,19 @@
      </text>
      <combo_box name="gsits" label=""/>
      <text name="textdefaultcrouch">
-        Standard geduckt:
+        Standard Hocke:
      </text>
      <combo_box name="crouchs" label=""/>
      <text name="textdefaultcrouchwalk">
-        Standard geduckt Gang:
+        Standard geduckter Gang:
      </text>
      <combo_box name="cwalks" label=""/>
      <text name="textdefaultfall">
-        Standard fallen:
+        Standard Fall:
      </text>
      <combo_box name="falls" label=""/>
      <text name="textdefaulthover">
-        Standard scheweben:
+        Standard Schweben:
      </text>
      <combo_box name="hovers" label=""/>
      <text name="textdefaultfly">
diff --git a/linden/indra/newview/skins/default/xui/de/floater_auction.xml b/linden/indra/newview/skins/default/xui/de/floater_auction.xml
index 42f6a07..3117222 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_auction.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_auction.xml
@@ -4,6 +4,6 @@
        <button label="Foto" label_selected="Foto" name="snapshot_btn" />
        <button label="OK" label_selected="OK" name="ok_btn" />
        <text name="already for sale">
-                Parzellen, die bereits zum Verkauf stehen, können nicht auktioniert werden.
+                Parzellen, die bereits zum Verkauf stehen, können nicht versteigert werden.
        </text>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_avatar_picker.xml b/linden/indra/newview/skins/default/xui/de/floater_avatar_picker.xml
index c546d91..3d40c60 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_avatar_picker.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_avatar_picker.xml
@@ -7,7 +7,7 @@
 Einwohners ein:
                        </text>
                        <line_editor bottom_delta="-36" name="Edit" />
-                        <button label="Suchen" label_selected="Suchen" name="Find"/>
+                        <button label="Finden" label_selected="Finden" name="Find"/>
                        <scroll_list height="74" name="SearchResults" bottom_delta="-79"/>
                </panel>
                <panel label="Visitenkarten" name="CallingCardsPanel">
diff --git a/linden/indra/newview/skins/default/xui/de/floater_avatar_textures.xml b/linden/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
index 823d6de..49159cd 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
@@ -6,26 +6,26 @@
        <text name="composite_label" width="150">
                Zusammengesetzte Texturen
        </text>
-        <button label="Läd IDs in Konsole ab" label_selected="Abladen" name="Dump"/>
+        <button label="Lädt IDs in Konsole ab" label_selected="Abladen" name="Dump"/>
        <texture_picker label="Haare" name="hair-baked"/>
        <texture_picker label="Haar" name="hair"/>
        <texture_picker label="Kopf" name="head-baked"/>
-        <texture_picker label="Make-Uup" name="head bodypaint"/>
+        <texture_picker label="Make-Up" name="head bodypaint"/>
        <texture_picker label="Augen" name="eyes-baked"/>
        <texture_picker label="Auge" name="iris"/>
        <texture_picker label="Oberkörper" name="upper-baked"/>
-        <texture_picker label="Oberkörpertattoo" name="upper bodypaint"/>
+        <texture_picker label="Oberkörper-Tätowierung" name="upper bodypaint"/>
        <texture_picker label="Unterhemd" name="undershirt"/>
        <texture_picker label="Handschuhe" name="gloves"/>
        <texture_picker label="Hemd" name="shirt"/>
-        <texture_picker label="Oberjacke" name="upper jacket"/>
+        <texture_picker label="Jackenoberteil" name="upper jacket"/>
        <texture_picker label="Unterkörper" name="lower-baked"/>
        <texture_picker label="Unterkörper-Tätowierung" name="lower bodypaint"/>
        <texture_picker label="Unterhose" name="underpants"/>
        <texture_picker label="Socken" name="socks"/>
        <texture_picker label="Schuhe" name="shoes"/>
        <texture_picker label="Hose" name="pants"/>
-        <texture_picker label="Jacke" name="lower jacket"/>
+        <texture_picker label="Jackenunterteil" name="lower jacket"/>
        <texture_picker label="Rock" name="skirt-baked"/>
        <texture_picker label="Rock" name="skirt"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_beacons.xml b/linden/indra/newview/skins/default/xui/de/floater_beacons.xml
index 0992727..37b3a98 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_beacons.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_beacons.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="beacons" title="Beacons">
+<floater name="beacons" title="Leitstrahl">
        <panel name="beacons_panel">
                <check_box label="Auf Berührung beschränkte Skriptobjekte" name="touch_only"/>
                <check_box label="Skripting-Objekte" name="scripted"/>
                <check_box label="Physische Objekte" name="physical"/>
                <check_box label="Soundquellen" name="sounds"/>
                <check_box label="Partikelquellen" name="particles"/>
-                <check_box label="Glanzlichter anzeigen" name="highlights"/>
+                <check_box label="Hervorhebungen anzeigen" name="highlights"/>
-                <check_box label="Beacons anzeigen" name="beacons"/>
+                <check_box label="Leitstrahlen anzeigen" name="beacons"/>
                <text name="beacon_width_label">
-                        Beacon-Breite:
+                        Leitstrahl-Breite:
                </text>
        </panel>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_build_options.xml b/linden/indra/newview/skins/default/xui/de/floater_build_options.xml
index de3617e..0541116 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_build_options.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_build_options.xml
@@ -1,8 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="build options floater" title="Rasteroptionen">
+<floater name="build options floater" title="Erweiterte Bauoptionen">
-        <spinner label="Rastereinheit (Meter)" name="GridResolution" />
+  <text name="text_box7"> 
-        <spinner label="Rastergröße (Meter)" name="GridDrawSize" />
+        Rasteroptionen:</text>
-        <check_box label="Einrasten von Untereinheiten aktivieren" name="GridSubUnit" />
+        <spinner label="Rastereinheit (m)" name="GridResolution" />
+        <spinner label="Rastergröße (m)" name="GridDrawSize" />
+        <check_box label="Untereinheiten einrasten" name="GridSubUnit" />
        <check_box label="Querschnitte anzeigen" name="GridCrossSection" />
        <slider label="Rasterdeckkraft" name="GridOpacity" />
+  <text name="text_box3">
+        Objektgröße:</text>
+        <spinner label="X-Größe:" name="X size" />
+        <spinner label="Y-Größe:" name="Y size" />
+        <spinner label="Z-Größe:" name="Z size" />
+  <text name="text_box6">
+        Angelpunkt der Achsen:</text>
+        <check_box label="Größen in Prozent" tool_tip="Standardeinstellung sind Prozent und alle Achsen auf 50" name="PivotPercToggle" />
+        <check_box label="Selektionsumrisse zeigen" name="BuildPrefsRenderHighlight_toggle" />
+        <check_box label="Selektionsdistanz limitieren" name="limit_select_dist_check" />
+        <check_box label="Achsen auf Hauptprim zeigen" tool_tip="Standardverhalten ist die Anzeige der Achsen auf dem Massensenter des gesamten Objekts. Aktiviert werden die Achsen stattdessen auf dem Hauptprim eines Objektes gezeigt." name="BuildPrefsActualRoot_toggle" />
+        <check_box label="Objekteintritt mit Landesgruppe" tool_tip="Objekte auf Gruppenland mit dieser Gruppe erzeugen (wenn möglich." name="grouplandrez" />
+        <spinner label="Dezimalstellen Bearbeitung" tool_tip="Setzt die Standard-Genauigkeit für bewegen, Größe ändern und rotieren fest." name="spinner_decimal" />
+  <button label="Übernehmen" name="btn_apply" />
+  <button label="Abbrechen" name="btn_cancel" />
+  <button label="OK" name="btn_ok" />
+  <button label="Standard wiederherstellen" name="btn_reset" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_bulk_perms.xml b/linden/indra/newview/skins/default/xui/de/floater_bulk_perms.xml
index f058a0e..828a72b 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_bulk_perms.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="Mehrere Inhaltsberechtigungen ändern">
+<floater name="floaterbulkperms" title="Inhaltsberechtigungen im Paket ändern">
        <text name="applyto">
                Inhaltsarten
        </text>
@@ -10,8 +10,8 @@
        <check_box label="Landmarken" name="check_landmark"/>
        <check_box label="Notizkarten" name="check_notecard"/>
        <check_box label="Objekte" name="check_object"/>
-        <check_box label="Skripts" name="check_script"/>
+        <check_box label="Skripte" name="check_script"/>
-        <check_box label="Sounds" name="check_sound"/>
+        <check_box label="Klänge" name="check_sound"/>
        <check_box label="Texturen" name="check_texture"/>
        <button label="Alle auswählen" label_selected="Alle" name="check_all"/>
        <button label="Keine" label_selected="Keine" name="check_none"/>
@@ -19,7 +19,7 @@
                Neue Berechtigungen
        </text>
        <check_box label="Mit Gruppe teilen" name="share_with_group"/>
-        <check_box label="Kopieren allen erlauben" name="everyone_copy"/>
+        <check_box label="Allen kopieren erlauben" name="everyone_copy"/>
        <text name="NextOwnerLabel">
                Nächster Eigentümer kann:
        </text>
@@ -36,9 +36,9 @@
                Berechtigungen werden eingestellt auf [NAME]
        </string>
        <string name="start_text">
-                Start: Anforderung auf Änderung der Berechtigung...
+                Start: Anforderung auf Änderung der Berechtigungen...
        </string>
        <string name="done_text">
-                Ende: Anforderung auf Änderung der Berechtigung.
+                Ende: Anforderung auf Änderung der Berechtigungen.
        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_buy_contents.xml b/linden/indra/newview/skins/default/xui/de/floater_buy_contents.xml
index 01858b3..8424a7f 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_buy_contents.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_buy_contents.xml
@@ -4,7 +4,7 @@
                [NAME] enthält:
        </text>
        <text name="buy_text">
-                [AMOUNT] L$ von [NAME] kaufen?
+                Für[CURRENCY][AMOUNT] von [NAME] kaufen?
        </text>
        <button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn" width="73" />
        <button label="Kaufen" label_selected="Kaufen" name="buy_btn" />
@@ -16,6 +16,6 @@
                (kein Bearbeiten)
        </text>
        <text name="no_transfer_text">
-                (kein Transferieren)
+                (kein Übertragen)
        </text>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_buy_currency.xml b/linden/indra/newview/skins/default/xui/de/floater_buy_currency.xml
index 787f469..d678327 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_buy_currency.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_buy_currency.xml
@@ -14,22 +14,22 @@
        </text>
        <button label="Gehe zu Website" name="error_web" />
        <text name="contacting">
-                LindeX wird kontaktiert...
+                Geldwechsler wird kontaktiert...
        </text>
        <text name="buy_action_unknown">
-                L$ an der LindeX kaufen
+                [CURRENCY] am Geldwechsler kaufen
        </text>
        <text name="buy_action">
-                [NAME] L$ [PRICE]
+                [NAME] [CURRENCY] [PRICE]
        </text>
        <text name="currency_action" width="90">
-                L$ kaufen
+                [CURRENCY] kaufen
        </text>
        <line_editor left_delta="55" name="currency_amt">
                1234
        </line_editor>
        <text name="currency_est">
-                für ca. [USD] US$
+                für ca. [REALCURRENCY] [USD]
        </text>
        <text name="getting_data">
                Daten werden geladen...
@@ -38,31 +38,32 @@
                Sie haben zurzeit
        </text>
        <text name="balance_amount">
-                [AMT] L$
+                [AMT] [CURRENCY] 
        </text>
        <text name="buying_label">
                Sie kaufen
        </text>
        <text name="buying_amount">
-                [AMT] L$
+                [AMT] [CURRENCY] 
        </text>
        <text name="total_label">
                Ihr neuer Kontostand:
        </text>
        <text name="total_amount">
-                [AMT] L$
+                [AMT] [CURRENCY] 
        </text>
        <text name="purchase_warning_repurchase">
-                Dieser Einkauf betrifft ausschließlich Geld.
+                Best�tigen dieses Kaufs erwirbt ausschließlich Geld.
 Wiederholen Sie den Vorgang.
        </text>
        <text name="purchase_warning_notenough">
                Sie kaufen nicht genügend Geld.
-Kaufen Sie mehr.
+Erhöhen Sie den Betrag.
        </text>
        <button label="Kaufen" name="buy_btn" />
        <button label="Abbrechen" name="cancel_btn" />
        <text name="buy_currency">
-                [LINDENS] L$ für ca. [USD] US$ kaufen
+                [CURRENCY] [LINDENS] für ca. [REALCURRENCY] [USD]
+kaufen
        </text>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_buy_land.xml b/linden/indra/newview/skins/default/xui/de/floater_buy_land.xml
index 44ae6b0..c929470 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_buy_land.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_buy_land.xml
@@ -31,7 +31,7 @@
                Wiederverkauf möglich oder nicht möglich.
        </text>
        <text name="changeable_clause">
-                Darft oder darf nicht zusammengelegt/unterteilt werden.
+                Darf oder darf nicht zusammengelegt/unterteilt werden.
        </text>
        <text name="covenant_text">
                Sie müssen dem Grundstücksvertrag zustimmen:
@@ -99,7 +99,7 @@ Diese Parzelle ist 512 qm groß.
                Sie haben 2.100 L$.
        </text>
        <text name="currency_action">
-                Mehr L$ kaufen
+                Mehr [CURRENCY] kaufen
        </text>
        <line_editor name="currency_amt">
                1000
@@ -114,10 +114,10 @@ Diese Parzelle ist 512 qm groß.
        <button label="Kaufen" name="buy_btn"/>
        <button label="Abbrechen" name="cancel_btn"/>
        <string name="can_resell">
-                Verkauf möglich.
+                Weiterverkauf möglich.
        </string>
        <string name="can_not_resell">
-                Verkauf nicht möglich.
+                Weiterverkauf nicht möglich.
        </string>
        <string name="can_change">
                Zusammenlegen/unterteilen möglich.
@@ -126,7 +126,7 @@ Diese Parzelle ist 512 qm groß.
                Zusammenlegen/unterteilen nicht möglich.
        </string>
        <string name="cant_buy_for_group">
-                Sie sind nicht berechtigt, Land für die aktive Gruppe zu kaufen.
+                Sie sind nicht berechtigt, Land für Ihre aktive Gruppe zu kaufen.
        </string>
        <string name="no_land_selected">
                Kein Land ausgewählt.
@@ -136,7 +136,7 @@ Diese Parzelle ist 512 qm groß.
 Verkleinern Sie Ihre Auswahl.
        </string>
        <string name="no_permission">
-                Sie sind nicht berechtigt, Land für die aktive Gruppe zu kaufen.
+                Sie sind nicht berechtigt, Land für Ihre aktive Gruppe zu kaufen.
        </string>
        <string name="parcel_not_for_sale">
                Die ausgewählte Parzelle steht nicht zum Verkauf.
@@ -169,7 +169,7 @@ Verkleinern Sie Ihre Auswahl.
                Bei Landkauf:
        </string>
        <string name="buying_for_group">
-                Landkauf für Gruppe:
+                Bei Landkauf für Gruppe:
        </string>
        <string name="cannot_buy_now">
                Kaufen jetzt nicht möglich:
@@ -181,7 +181,7 @@ Verkleinern Sie Ihre Auswahl.
                nicht benötigt
        </string>
        <string name="must_upgrade">
-                Sie müssen Ihr Konto upgraden, um Land kaufen zu können.
+                Sie müssen Ihr Konto erweitern, um Land kaufen zu können.
        </string>
        <string name="cant_own_land">
                Mit Ihrem Konto können Sie Land kaufen.
@@ -190,10 +190,10 @@ Verkleinern Sie Ihre Auswahl.
                Sie besitzen [BUYER] qm Land.
        </string>
        <string name="pay_to_for_land">
-                [SELLER] [AMOUNT] L$ für das Land bezahlen
+                [SELLER] [AMOUNT] [CURRENCY] für das Land bezahlen
        </string>
        <string name="buy_for_US">
-                [AMOUNT] L$ für circa [AMOUNT2] US$ kaufen,
+                [AMOUNT] [CURRENCY] für circa [AMOUNT2] US$ kaufen,
        </string>
        <string name="parcel_meters">
                Diese Parzelle ist [AMOUNT] qm groß.
@@ -215,29 +215,29 @@ unterstützt [AMOUNT2] Objekte
                Objekte nicht im Verkauf mit eingeschlossen
        </string>
        <string name="info_price_string">
-                [PRICE] L$
+                [PRICE] [CURRENCY] 
-([PRICE_PER_SQM] L$/qm)
+([PRICE_PER_SQM] [CURRENCY] /qm)
 [SOLD_WITH_OBJECTS]
        </string>
        <string name="insufficient_land_credits">
                Die Gruppe [GROUP] benötigt ausreichende gespendete Landnutzungsrechte, um die Parzelle abzudecken, bevor der Kauf abgeschlossen werden kann.
        </string>
        <string name="have_enough_lindens">
-                Sie haben [AMOUNT] L$, genug zum Kauf dieses Landes.
+                Sie haben [AMOUNT] [CURRENCY], genug zum Kauf dieses Landes.
        </string>
        <string name="not_enough_lindens">
-                Sie haben nur [AMOUNT] L$, brauchen aber mindestens [AMOUNT2] L$.
+                Sie haben nur [AMOUNT] [CURRENCY] , brauchen aber mindestens [AMOUNT2] [CURRENCY] .
        </string>
        <string name="balance_left">
-                Nach dem Einkauf verbleiben Ihnen noch [AMOUNT] L$.
+                Nach dem Einkauf verbleiben Ihnen noch [AMOUNT] [CURRENCY].
        </string>
        <string name="balance_needed">
-                Für dieses Land müssen Sie mindestens [AMOUNT] L$ kaufen.
+                Für dieses Land müssen Sie mindestens [AMOUNT] [CURRENCY]  kaufen.
        </string>
        <string name="no_parcel_selected">
                (keine Parzelle ausgewählt)
        </string>
        <string name="buy_currency">
-                [LINDENS] L$ für ca. [USD] US$ kaufen
+                [LINDENS] [CURRENCY] für ca. [USD] US$ kaufen
        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_buy_object.xml b/linden/indra/newview/skins/default/xui/de/floater_buy_object.xml
index 3cfa59f..1ec4b4b 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_buy_object.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_buy_object.xml
@@ -4,7 +4,7 @@
                samt Inhalt:
        </text>
        <text name="buy_text">
-                [AMOUNT] L$ von [NAME] kaufen?
+                Von [NAME] für [AMOUNT] [CURRENCY] kaufen?
        </text>
        <button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn" width="73" />
        <button label="Kaufen" label_selected="Kaufen" name="buy_btn" />
@@ -21,6 +21,6 @@
                (kein Bearbeiten)
        </text>
        <text name="no_transfer_text">
-                (kein Transferieren)
+                (kein Übertragen)
        </text>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/de/floater_chat_history.xml
index d5370dc..fb136f8 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_chat_history.xml
@@ -28,7 +28,7 @@
                Dem Objekt „[OBJECTNAME]“, ein Objekt von „[OWNERNAME]“, in [REGIONNAME] [REGIONPOS], wurde folgende Berechtigung verweigert: [PERMISSIONS].
        </string>
        <string name="ScriptTakeMoney">
-                Linden-Dollar (L$) von Ihnen nehmen
+                Geld von Ihnen nehmen
        </string>
        <string name="ActOnControlInputs">
                Steuerung festlegen
@@ -68,11 +68,14 @@
                                </combo_item>
                        </combo_box>
                        <check_box label="Stummgeschalteten Text anzeigen" name="show mutes"/>
+                        <check_box label="Chat übersetzen (powered by Google)" name="translate chat" />
                        <button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Klicken Sie hier, um eine Liste der aktiven Teilnehmer an dieser IM-Sitzung anzuzeigen."/>
                        <panel name="chat_panel">
                                <string name="gesture_label">
                                        Gesten
                                </string>
+        <!--<spinner label="Kanal" name="channel_control" 
+tool_tip="Standardkanal für In-Welt-Chat festlegen"/>-->
                                <line_editor label="Zum Chatten hier klicken." name="Chat Editor" right="-75"/>
                                <flyout_button label="Sagen" left="-70" name="Say" tool_tip="(Eingabe)" width="75">
                                        <flyout_button_item name="shout_item">
diff --git a/linden/indra/newview/skins/default/xui/de/floater_chatterbox-vertical.xml b/linden/indra/newview/skins/default/xui/de/floater_chatterbox-vertical.xml
new file mode 100644
index 0000000..de51ecc
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/de/floater_chatterbox-vertical.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<multi_floater name="floater_chatterbox" title="Unterhalten" />
+  <string name="unread_count_string_singular">
+    Ungelesene IM
+  </string>
+  <string name="unread_count_string_plural">
+    Ungelesene IMs
+  </string>
+</multi_floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_chatterbox.xml b/linden/indra/newview/skins/default/xui/de/floater_chatterbox.xml
index 548b615..de51ecc 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_chatterbox.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_chatterbox.xml
@@ -1,2 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <multi_floater name="floater_chatterbox" title="Unterhalten" />
+  <string name="unread_count_string_singular">
+    Ungelesene IM
+  </string>
+  <string name="unread_count_string_plural">
+    Ungelesene IMs
+  </string>
+</multi_floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_command_line.xml b/linden/indra/newview/skins/default/xui/de/floater_command_line.xml
new file mode 100644
index 0000000..e3b2ec3
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/de/floater_command_line.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="busy" title="Chatleisten-Befehle">
+  <text name="loltxt2">        Innerhalb des Sims teleportieren (Nutzung: cmd x y z)</text>
+  <line_editor tool_tip="" name="CmdLineChatbarPos"/>
+  <text name="loltxt3">        Zum Boden teleportieren (Nutzung: cmd)</text>
+  <line_editor tool_tip="" name="CmdLineChatbarGround"/>
+  <text name="loltxt4">        In Höhe teleportieren (Nutzung: cmd z)</text>
+  <line_editor tool_tip="" name="CmdLineChatbarHeight"/>
+  <text name="loltxt5">        Nach Hause teleportieren (Nutzung: cmd)</text>
+  <line_editor tool_tip="" name="CmdLineChatbarTeleportHome"/>
+  <text name="loltxt6">        Eine Plattform schaffen (Nutzung: cmd 0 - 30)</text>
+  <line_editor tool_tip="" name="CmdLineChatbarRezPlatform"/>
+  <slider name="CmdLineChatbarPlatformSize" label="Breite" tool_tip="Wie groß soll die Plattform sein?"/>
+  <text name="loltxt7">        Zu Sim x teleportieren (Nutzung: cmd simname)</text>
+  <line_editor tool_tip="" name="CmdLineChatbarMapTo"/>
+  <check_box label="Gleiche Position nutzen" name="toggle"/>
+  <text name="loltxt8">        math. Ausdruck rechnen (Nutzung: cmd SIN(2+2))</text>
+  <line_editor tool_tip="" name="CmdLineChatbarCalc"/>
+  <text name="add_autokorrect">Wort zu Autokorrekt zufügen(Nutzung: cmd list|bad|good)</text>
+  <line_editor tool_tip="" name="CmdLineChatbarAutocorrect"/>
+  <text name="loltxt9">        Sichtweite ändern (Nutzung: cmd meters)</text>
+  <line_editor tool_tip="" name="CmdLineChatbarDrawDistance"/>
+  <text name="loltxt10">        Zur Kameraposition teleportieren (Nutzung: cmd)</text>
+  <line_editor tool_tip="" name="CmdLineChatbarTeleportToCam"/>
+  <text name="loltxt11">        Avatarname von Schl�ssel beziehen (Nutzung: cmd key)</text>
+  <line_editor tool_tip="" name="CmdLineChatbarKeyToName"/>
+  <text name="loltxt12">        Avatar Teleport anbieten (Nutzung: cmd key)</text>
+  <line_editor tool_tip="" name="CmdLineChatbarOfferTp"/>
+  <text name="loltxt13">        Zu Avatar teleportieren (Nutzung: cmd name)</text>
+  <line_editor tool_tip="Die syntax dieses Befehls erlaubt partielle Namen (ohne Groß-/Kleinschreibung).  Bessere Resultate bei Nutzung mit offenem Radar."
+     name="CmdLineChatbarTP2"/>
+  <text name="loltxt14">        AO an/aus (Nutzung: cmd on/off)</text>
+  <line_editor tool_tip="" name="CmdLineChatbarAO"/>
+  <text name="loltxt15">        Chat-Historie löschen (Nutzung: cmd)</text>
+  <line_editor tool_tip="Löscht die Chat-Historie, um Lag-Effekte von Chat-Spammern zu verhindern." name="CmdLineChatbarClearChat"/>
+  <text name="loltxt15">        Medien-URL bestimmen (Nutzung: cmd url type)</text>
+  <line_editor tool_tip="Bestimmt und spielt Ihren Medienstrom auf die eingegebene URL" name="CmdLineChatbarMedia"/>
+  <text name="loltxt15">        Musik-URL bestimmen (Nutzung: cmd url)</text>
+  <line_editor tool_tip="Bestimmt und spielt Ihren Musikstrom auf die eingegebene URL" name="CmdLineChatbarMusic"/>
+  <button label="?" name="Help_CmdLine" 
+tool_tip="Hier für Hilfe betreffend der Einstellungen dieser Seite klicken."/>
+</floater>
+\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/de/floater_critical.xml b/linden/indra/newview/skins/default/xui/de/floater_critical.xml
index 0b14792..d18d7d4 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_critical.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_critical.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="modal container" title=" ">
+<floater name="modal container" title="">
        <button label="Weiter" label_selected="Weiter" name="Continue" />
        <button label="Abbrechen" label_selected="Abbrechen" name="Cancel" />
        <text name="tos_title">
diff --git a/linden/indra/newview/skins/default/xui/de/floater_customize.xml b/linden/indra/newview/skins/default/xui/de/floater_customize.xml
index b27e5d2..c528b61 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_customize.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_customize.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater customize" title="Aussehen">
        <tab_container name="customize tab container">
-                <panel label="Körperteile" name="body_parts_placeholder"/>
+                <panel label="Körperteile" name="body_parts_placeholder" />
                <panel label="Form" name="Shape">
                        <button font="SansSerifSmall" label="Zurücksetzen" label_selected="Zurücksetzen" name="Revert"/>
                        <button label="Körper" label_selected="Körper" name="Body"/>
@@ -12,8 +12,8 @@
                        <button label="Mund" label_selected="Mund" name="Mouth"/>
                        <button label="Kinn" label_selected="Kinn" name="Chin"/>
                        <button label="Oberkörper" label_selected="Oberkörper" name="Torso"/>
-                        <button label="Beine" label_selected="Beine" name="Legs"/>
+                        <button label="Beine" label_selected="Beine" name="Legs" />
-                        <radio_group name="sex radio">
+                        <radio_group control_name="AvatarSex" name="sex radio">
                                <radio_item length="1" name="radio" type="string">
                                        Weiblich
                                </radio_item>
@@ -51,10 +51,11 @@ und diese anziehen.
                        <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/>
                        <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." left="194" name="Save As" width="105"/>
                </panel>
                <panel label="Haut" name="Skin">
                        <button label="Hautfarbe" label_selected="Hautfarbe" left="2" name="Skin Color" width="92"/>
                        <button label="Gesichtsdetails" label_selected="Gesichtsdetails" left="2" name="Face Detail" width="92"/>
-                        <button label="Make-Uup" label_selected="Make-Uup" left="2" name="Makeup" width="92"/>
+                        <button label="Make-Up" label_selected="Make-Up" left="2" name="Makeup" width="92"/>
                        <button label="Körperdetails" label_selected="Körperdetails" left="2" name="Body Detail" width="92"/>
                        <text length="1" name="title" type="string">
                                [DESC]
@@ -82,9 +83,9 @@ und diese anziehen.
                        <text name="Item Action Label" right="100">
                                Haut:
                        </text>
-                        <texture_picker label="Kopftattoo" name="Head Tattoos" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
+                        <texture_picker label="Kopftattoo" name="Head Tattoos" tool_tip="Hier klicken, um ein Bild auszuwählen"/>
-                        <texture_picker label="Obere Tattoos" name="Upper Tattoos" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
+                        <texture_picker label="Obere Tattoos" name="Upper Tattoos" tool_tip="Hier klicken, um ein Bild auszuwählen"/>
-                        <texture_picker label="Untere Tattoos" name="Lower Tattoos" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
+                        <texture_picker label="Untere Tattoos" name="Lower Tattoos" tool_tip="Hier klicken, um ein Bild auszuwählen"/>
                        <button label="Neue Haut" label_selected="Neue Haut" name="Create New"/>
                        <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/>
                        <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." left="194" name="Save As" width="105"/>
@@ -121,7 +122,7 @@ und diese anziehen.
                        <text name="Item Action Label" right="100">
                                Haare:
                        </text>
-                        <texture_picker label="Textur" name="Texture" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
+                        <texture_picker label="Textur" name="Texture" tool_tip="Hier klicken, um ein Bild auszuwählen"/>
                        <button label="Neue Haare" label_selected="Neue Haare" name="Create New"/>
                        <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/>
                        <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." left="194" name="Save As" width="105"/>
@@ -154,7 +155,7 @@ und diese anziehen.
                        <text name="Item Action Label" right="100">
                                Augen:
                        </text>
-                        <texture_picker label="Iris" name="Iris" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
+                        <texture_picker label="Iris" name="Iris" tool_tip="Hier klicken, um ein Bild auszuwählen"/>
                        <button label="Neue Augen" label_selected="Neue Augen" name="Create New"/>
                        <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/>
                        <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." left="194" name="Save As" width="105"/>
@@ -162,8 +163,8 @@ und diese anziehen.
                </panel>
                <panel label="Kleidung" name="clothes_placeholder"/>
                <panel label="Hemd" name="Shirt">
-                        <texture_picker label="Stoff" name="Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
+                        <texture_picker label="Stoff" name="Fabric" tool_tip="Hier klicken, um ein Bild auszuwählen"/>
-                        <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
+                        <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Hier klicken, um die Farbauswahl zu öffnen"/>
                        <button label="Neues Hemd" label_selected="Neues Hemd" name="Create New"/>
                        <button font="SansSerifSmall" label="Ausziehen" label_selected="Ausziehen" name="Take Off"/>
                        <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/>
@@ -197,8 +198,8 @@ und dieses anziehen.
                        </text>
                </panel>
                <panel label="Hose" name="Pants">
-                        <texture_picker label="Stoff" name="Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
+                        <texture_picker label="Stoff" name="Fabric" tool_tip="Hier klicken, um ein Bild auszuwählen"/>
-                        <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
+                        <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Hier klicken, um die Farbauswahl zu öffnen"/>
                        <button label="Neue Hose" label_selected="Neue Hose" name="Create New"/>
                        <button font="SansSerifSmall" label="Ausziehen" label_selected="Ausziehen" name="Take Off"/>
                        <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/>
@@ -258,8 +259,8 @@ und diese anziehen.
                        <text name="Item Action Label" right="100">
                                Schuhe:
                        </text>
-                        <texture_picker label="Stoff" name="Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
+                        <texture_picker label="Stoff" name="Fabric" tool_tip="Hier klicken, um ein Bild auszuwählen"/>
-                        <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
+                        <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Hier klicken, um die Farbauswahl zu öffnen"/>
                        <button label="Neue Schuhe" label_selected="Neue Schuhe" name="Create New"/>
                        <button font="SansSerifSmall" label="Ausziehen" label_selected="Ausziehen" name="Take Off"/>
                        <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/>
@@ -328,9 +329,9 @@ und diese anziehen.
                        <text name="Item Action Label" right="100">
                                Jacke:
                        </text>
-                        <texture_picker label="Oberstoff" name="Upper Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
+                        <texture_picker label="Stoff oben" name="Upper Fabric" tool_tip="Hier klicken, um ein Bild auszuwählen"/>
-                        <texture_picker label="Unterstoff" name="Lower Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
+                        <texture_picker label="Stoff unten" name="Lower Fabric" tool_tip="Hier klicken, um ein Bild auszuwählen"/>
-                        <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
+                        <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Hier klicken, um die Farbauswahl zu öffnen"/>
                        <button label="Neue Jacke" label_selected="Neue Jacke" name="Create New"/>
                        <button font="SansSerifSmall" label="Ausziehen" label_selected="Ausziehen" name="Take Off"/>
                        <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/>
@@ -364,8 +365,8 @@ und diese anziehen.
                        <text name="Item Action Label" right="100">
                                Handschuhe:
                        </text>
-                        <texture_picker label="Stoff" name="Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
+                        <texture_picker label="Stoff" name="Fabric" tool_tip="Hier klicken, um ein Bild auszuwählen"/>
-                        <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
+                        <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Hier klicken, um die Farbauswahl zu öffnen"/>
                        <button label="Neue Handschuhe" label_selected="Neue Handschuhe" name="Create New"/>
                        <button font="SansSerifSmall" label="Ausziehen" label_selected="Ausziehen" name="Take Off"/>
                        <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/>
@@ -399,8 +400,8 @@ und dieses anziehen.
                        <text name="Item Action Label" right="100">
                                Unterhemd:
                        </text>
-                        <texture_picker label="Stoff" name="Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
+                        <texture_picker label="Stoff" name="Fabric" tool_tip="Hier klicken, um ein Bild auszuwählen"/>
-                        <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
+                        <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Hier klicken, um die Farbauswahl zu öffnen"/>
                        <button label="Neues Unterhemd" label_selected="Neues Unterhemd" name="Create New"/>
                        <button font="SansSerifSmall" label="Ausziehen" label_selected="Ausziehen" name="Take Off"/>
                        <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/>
@@ -434,8 +435,8 @@ und diese anziehen.
                        <text name="Item Action Label" right="100">
                                Unterhose:
                        </text>
-                        <texture_picker label="Stoff" name="Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
+                        <texture_picker label="Stoff" name="Fabric" tool_tip="Hier klicken, um ein Bild auszuwählen"/>
-                        <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
+                        <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Hier klicken, um die Farbauswahl zu öffnen"/>
                        <button label="Neue Unterhose" label_selected="Neue Unterhose" name="Create New"/>
                        <button font="SansSerifSmall" label="Ausziehen" label_selected="Ausziehen" name="Take Off"/>
                        <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/>
@@ -469,16 +470,105 @@ und diesen anziehen.
                        <text name="Item Action Label" right="100">
                                Rock:
                        </text>
-                        <texture_picker label="Stoff" name="Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
+                        <texture_picker label="Stoff" name="Fabric" tool_tip="Hier klicken, um ein Bild auszuwählen"/>
-                        <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
+                        <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Hier klicken, um die Farbauswahl zu öffnen"/>
                        <button label="Neuer Rock" label_selected="Neuer Rock" name="Create New"/>
                        <button font="SansSerifSmall" label="Ausziehen" label_selected="Ausziehen" name="Take Off"/>
                        <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/>
                        <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." left="194" name="Save As" width="105"/>
                        <button font="SansSerifSmall" label="Zurücksetzen" label_selected="Zurücksetzen" name="Revert"/>
                </panel>
+                <panel label="Tätowierung" name="Tattoo">
+                        <text length="1" name="title" type="string">
+                                [DESC]
+                        </text>
+                        <text length="1" name="title_no_modify" type="string">
+                                [DESC]: bearbeiten nicht möglich
+                        </text>
+                        <text length="1" name="title_loading" type="string">
+                                [DESC]: wird geladen...
+                        </text>
+                        <text length="1" name="title_not_worn" type="string">
+                                [DESC]: nicht getragen
+                        </text>
+                        <text length="1" name="path" type="string">
+                                In [PATH]
+                        </text>
+                        <text length="1" name="not worn instructions" type="string">
+                                Ziehen Sie eine Tätowierung aus dem Inventar auf Ihren Avatar,
+um ihn zu tragen. Sie können auch eine neuen Tätowierung erstellen
+und diese anziehen.
+                        </text>
+                        <text length="1" name="no modify instructions" type="string">
+                                Sie sind nicht berechtigt, diese Kleidung zu bearbeiten.
+                        </text>
+                        <text name="Item Action Label" right="100">
+                                Tätowierung:
+                        </text>
+                        <texture_picker label="Kopftattoo" name="Head Tattoo" tool_tip="Hier klicken, um ein Bild auszuwählen"/>
+                        <texture_picker label="Tattoo oben" name="Upper Tattoo" tool_tip="Hier klicken, um ein Bild auszuwählen"/>
+                        <texture_picker label="Tattoo unten" name="Lower Tattoo" tool_tip="Hier klicken, um ein Bild auszuwählen"/>                    <button font="SansSerifSmall" label="Neue Tätowierung" label_selected="Neue Tätowierung" name="Create New"/>
+                        <button font="SansSerifSmall" label="Ausziehen" label_selected="Ausziehen" name="Take Off"/>
+                        <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/>
+                        <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." left="194" name="Save As" width="105"/>
+                        <button font="SansSerifSmall" label="Zurücksetzen" label_selected="Zurücksetzen" name="Revert"/>
+                </panel>
+                <panel label="Transparenz" name="Alpha">
+                        <text length="1" name="title" type="string">
+                                [DESC]
+                        </text>
+                        <text length="1" name="title_no_modify" type="string">
+                                [DESC]: bearbeiten nicht möglich
+                        </text>
+                        <text length="1" name="title_loading" type="string">
+                                [DESC]: wird geladen...
+                        </text>
+                        <text length="1" name="title_not_worn" type="string">
+                                [DESC]: nicht getragen
+                        </text>
+                        <text length="1" name="path" type="string">
+                                In [PATH]
+                        </text>
+                        <text length="1" name="not worn instructions" type="string">
+                                Ziehen Sie eine Transparenz-Maske aus dem Inventar auf Ihren Avatar,
+um ihn zu tragen. Sie können auch eine neue Maske erstellen
+und diese anziehen.
+                        </text>
+                        <text length="1" name="no modify instructions" type="string">
+                                Sie sind nicht berechtigt, diese Kleidung zu bearbeiten.
+                        </text>
+                        <text name="Item Action Label" right="100">
+                                Transparenz:
+                        </text>
+                        <texture_picker label="Transp. Kopf" name="Head Alpha" tool_tip="Hier klicken, um ein Bild auszuwählen" width="68" left_delta="85" />
+                        <texture_picker label="Transp. oben" name="Upper Alpha" tool_tip="Hier klicken, um ein Bild auszuwählen" width="68" left_delta="85" />
+                        <texture_picker label="Transp. unten" name="Lower Alpha" tool_tip="Hier klicken, um ein Bild auszuwählen" width="68" left_delta="85" />
+                        <texture_picker label="Transp. Haar" name="Hair Alpha" tool_tip="Hier klicken, um ein Bild auszuwählen" width="68" left_delta="85" />
+                        <texture_picker label="Transp. Augen" name="Eye Alpha" tool_tip="Hier klicken, um ein Bild auszuwählen" width="68" left_delta="85" />
+                        <button label="Neue Maske" label_selected="Neue Maske" name="Create New"/>
+                        <button font="SansSerifSmall" label="Ausziehen" label_selected="Ausziehen" name="Take Off"/>
+                        <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/>
+                        <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." left="194" name="Save As" width="105"/>
+                        <button font="SansSerifSmall" label="Zurücksetzen" label_selected="Zurücksetzen" name="Revert"/>
+                </panel>
        </tab_container>
-        <button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/>
-        <button label="OK" label_selected="OK" name="Ok"/>
+        <text type="string" name="AvatarHeightText">
+    Avatar Größe:
+        </text>
+        <text type="string" name="HeightText">
+    Avatar Größe
+        </text>
+        <text type="string" name="HeightText2">
+    Avatar Größe2
+        </text>
+        <text type="string" name="includes_shoes">
+    (inkl. Schuhe)
+        </text>
+        <button name="Import" label="Import." label_selected="Importieren" />
+        <button name="Export" label="Export." label_selected="Exportieren" />
        <button label="Outfit erstellen..." label_selected="Outfit erstellen..." name="Make Outfit" width="115"/>
+        <button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/>
+        <button label="OK" label_selected="OK" name="Ok"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_dictionaries.xml b/linden/indra/newview/skins/default/xui/de/floater_dictionaries.xml
new file mode 100644
index 0000000..8c034b9
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/de/floater_dictionaries.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="EmeraldIRC_dictionaries" title="Neue Wörterbücher herunterladen">
+     <text name="EmDics_txt">
+Unten stehend ist eine Liste weiterer Wörterbücher, die
+von der Imprudence Internetseite heruntergeladen
+werden können. 
+Suchen Sie bitte das Gewünschte aus und klicken Sie
+auf die Schaltfläche „Herunterladen“.</text>
+     <button label="Herunterladen" name="Emerald_dic_download" />
+</floater> 
+\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/de/floater_directory.xml b/linden/indra/newview/skins/default/xui/de/floater_directory.xml
index c3bc8f0..2c61c75 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_directory.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_directory.xml
@@ -1,6 +1,37 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="directory" title="Suchen">
+<floater name="directory" title="Suche">
        <tab_container name="Directory Tabs">
+                <panel label="All" name="find_all_old_panel">
+                        <string name="searching_text">
+                                Suchen...
+                        </string>
+                        <string name="not_found_text">
+                                Nicht gefunden.
+                        </string>
+                        <button label="&lt; Vor" label_selected="&lt; Vor" name="&lt; Prev" />
+                        <button label="Weiter &gt;" label_selected="Weiter &gt;" name="Next &gt;" />
+                        <text name="find">
+                                Finden:
+                        </text>
+                        <line_editor name="name" />
+                        <button label="Suchen" label_selected="Suchen" name="Search" />
+                        <check_box control_name="ShowPGSearchAll" label="„PG“-Inhalt" name="incpg" />
+                        <check_box control_name="ShowMatureSearchAll" label="Inhalt „Reif“" name="incmature" />
+                        <check_box control_name="ShowAdultSearchAll" label="Inhalt „Erwachsen“" name="incadult" />
+                        <scroll_list name="results">
+                                <column label="" name="icon" width="24" />
+                                <column label="Name" name="name" width="235" />
+                                <column label="Preis" name="price" width="90" />
+                                <column label="Datum" name="date" width="90" />
+                                <column label="Zeit" name="time" width="-1" />
+                                <column label="Traffic" name="dwell" width="90" />
+                                <column label="Bereich" name="area" width="90" />
+                                <column label="[CURRENCY]/qm" name="per_meter" width="90" />
+                                <column label="Online" name="online" width="90" />
+                                <column label="Mitglieder" name="members" width="90" />
+                        </scroll_list>
+                        <text name="result_text" />
+                </panel>
                <panel label="Alle" name="find_all_panel">
                        <string name="searching_text">
                                Suchen...
@@ -9,13 +40,14 @@
                                Nicht gefunden.
                        </string>
                        <text name="find">
-                                Suchen:
+                                Finden:
                        </text>
-                        <line_editor label="Suchen" name="search_editor" tool_tip="Second Life durchsuchen"/>
+                        <line_editor label="Suche" name="search_editor" tool_tip="Das Internet durchsuchen" />
                        <button label="Zurück" name="back_btn"/>
                        <button label="Weiter" name="forward_btn"/>
                        <button label="Suchen" name="search_btn"/>
                        <combo_box name="Category">
+                        <combo_box name="Category">
                                <combo_item name="AnyCategory">
                                        Alle Kategorien
                                </combo_item>
@@ -35,10 +67,12 @@
                                        Wiki
                                </combo_item>
                        </combo_box>
-                        <check_box label="PG-Inhalt" name="incpg"/>
+                        <check_box control_name="ShowPGSearchAll" label="„PG“-Inhalt" name="incpg" />
-                        <check_box label="Mature-Inhalt" name="incmature"/>
+                        <check_box control_name="ShowMatureSearchAll" label="Inhalt „Reif“" name="incmature" />
-                        <check_box label="Adult-Inhalt" name="incadult"/>
+                        <check_box control_name="ShowAdultSearchAll" label="Inhalt „Erwachsen“" name="incadult" />
-                        <button label="?" label_selected="?" name="?"/>
+                        <button label="?" label_selected="?" name="?" />
+                        <web_browser name="find_browser" />
+                        <text name="status_text" />
                        <string name="loading_text">
                                Wird geladen...
                        </string>
@@ -48,7 +82,8 @@
                        <string name="redirect_404_url">
                                http://secondlife.com/app/search/notfound.html
                        </string>
-                </panel>
+      <string name="default_search_page">"http://secondlife.com/app/search/index.php?"</string>
+    </panel>
                <panel label="Anzeigen" name="classified_panel">
                        <string name="searching_text">
                                Suchen...
@@ -57,41 +92,41 @@
                                Nicht gefunden.
                        </string>
                        <text name="find">
-                                Suchen:
+                                Finden:
                        </text>
-                        <line_editor name="name"/>
+                        <line_editor name="name" />
-                        <check_box label="PG-Inhalt" name="incpg"/>
+                        <check_box control_name="ShowPGClassifieds" label="„PG“-Inhalt" name="incpg" />
-                        <check_box label="Mature-Inhalt" name="incmature"/>
+                        <check_box control_name="ShowMatureClassifieds" label="Inhalt „Reif“" name="incmature" />
-                        <check_box label="Adult-Inhalt" name="incadult"/>
+                        <check_box control_name="ShowAdultClassifieds" label="Inhalt „Erwachsen“" name="incadult" />
                        <combo_box name="Category">
-                                <combo_item name="AnyCategory">
+                                <combo_item name="AnyCategory" value="0">
                                        Alle Kategorien
                                </combo_item>
-                                <combo_item name="Shopping">
+                                <combo_item name="Shopping" value="1">
-                                        Shopping
+                                        Einkaufen 
                                </combo_item>
-                                <combo_item name="LandRental">
+                                <combo_item name="LandRental" value="2">
                                        Land mieten
                                </combo_item>
-                                <combo_item name="PropertyRental">
+                                <combo_item name="PropertyRental" value="3">
-                                        Immobilie mieten
+                                        Grundstück mieten
                                </combo_item>
-                                <combo_item name="SpecialAttraction">
+                                <combo_item name="SpecialAttraction" value="4">
                                        Attraktionen
                                </combo_item>
-                                <combo_item name="NewProducts">
+                                <combo_item name="NewProducts" value="5">
                                        Neue Produkte
                                </combo_item>
-                                <combo_item name="Employment">
+                                <combo_item name="Employment" value="6">
-                                        Stellenangebote
+                                        Stellenangebote 
                                </combo_item>
-                                <combo_item name="Wanted">
+                                <combo_item name="Wanted" value="7">
-                                        Gesucht
+                                        Gesucht 
                                </combo_item>
-                                <combo_item name="Service">
+                                <combo_item name="Service" value="8">
                                        Dienstleistungen
                                </combo_item>
-                                <combo_item name="Personal">
+                                <combo_item name="Personal" value="9">
                                        Persönlich
                                </combo_item>
                        </combo_box>
@@ -100,15 +135,17 @@
                        <button label="Anzeige aufgeben..." label_selected="Anzeige aufgeben..." name="Place an Ad..."/>
                        <button label="Löschen" label_selected="Löschen" name="Delete"/>
                        <scroll_list name="results">
-                                <column label="" name="icon"/>
+                                <column label="" name="icon" width="24" />
-                                <column label="" name="type"/>
+                                <column label="" name="type" width="-1" />
-                                <column label="Name" name="name"/>
+                                <column label="Name" name="name" width="225" />
-                                <column label="Price" name="price"/>
+                                <column label="Preis" name="price" width="55" />
                        </scroll_list>
-                        <button label="Weiter &gt;" label_selected="Weiter &gt;" name="Next &gt;"/>
+                        <text name="result_text" />
-                        <button label="&lt; Vorherige" label_selected="&lt; Vorherige" name="&lt; Prev"/>
+                        <button label="Weiter &gt;" label_selected="Weiter &gt;" name="Next &gt;" />
+                        <button label="&lt; Vor" label_selected="&lt; Vor"
+                             name="&lt; Prev" />
                </panel>
-                <panel label="Events" name="events_panel">
+                <panel label="Events" left="1" name="events_panel">
                        <string name="searching_text">
                                Suchen...
                        </string>
@@ -116,9 +153,9 @@
                                Nicht gefunden.
                        </string>
                        <text name="text2">
-                                Suchen:
+                                Finden:
                        </text>
-                        <line_editor name="event_search_text"/>
+                        <line_editor name="event_search_text" />
                        <radio_group name="date_mode">
                                <radio_item name="current">
                                        Stattfindend und anstehend
@@ -127,14 +164,14 @@
                                        Datum
                                </radio_item>
                        </radio_group>
-                        <button label="&lt;&lt;" label_selected="&lt;&lt;" name="&lt;&lt;" tool_tip="Einen Tag zurück"/>
+                        <button label="&lt;&lt;" label_selected="&lt;&lt;" name="&lt;&lt;" tool_tip="Einen Tag zurück" />
                        <text name="date_text">
                                6/6
                        </text>
-                        <button label="&gt;&gt;" label_selected="&gt;&gt;" name="&gt;&gt;" tool_tip="Einen Tag weiter"/>
+                        <button label="&gt;&gt;" label_selected="&gt;&gt;" name="&gt;&gt;" tool_tip="Einen Tag weiter" />
-                        <button label="Heute" label_selected="Heute" name="Today" tool_tip="Heutige Events anzeigen"/>
+                        <button label="Heute" label_selected="Heute" name="Today" tool_tip="Heutige Events anzeigen" />
                        <text name="text">
-                                Kategorie:
+                                Kategorie: 
                        </text>
                        <combo_box name="category combo" width="195" left="222">
                                <combo_item name="All">
@@ -174,21 +211,23 @@
                                        Sonstiges
                                </combo_item>
                        </combo_box>
-                        <check_box label="PG-Inhalt" name="incpg"/>
+                        <check_box control_name="ShowPGEvents" label="„PG“-Inhalt" name="incpg" />
-                        <check_box label="Mature-Inhalt" name="incmature"/>
+                        <check_box control_name="ShowMatureEvents" label="Inhalt „Reif“" name="incmature" />
-                        <check_box label="Adult-Inhalt" name="incadult"/>
+                        <check_box control_name="ShowAdultEvents" label="Inhalt „Erwachsen“" name="incadult" />
-                        <button label="Suchen" label_selected="Suchen" name="Search" tool_tip="Suchen"/>
+                        <button label="Suchen" label_selected="Suchen" name="Search" />
-                        <button label="Löschen" label_selected="Löschen" name="Delete"/>
+                        <button label="Löschen" label_selected="Löschen" name="Delete" />
                        <scroll_list name="results">
-                                <column label="" name="icon"/>
+                                <column label="" name="icon" width="24" />
-                                <column label="" name="type"/>
+                                <column label="" name="type" width="-1" />
-                                <column label="Name" name="name"/>
+                                <column dynamicwidth="true" label="Name" name="name" />
-                                <column label="Time (PT)" name="date"/>
+                                <column label="Datum" name="date" sort="time" width="106" />
-                                <column label="" name="event_id"/>
+                                <column label="" name="event_id" width="-1" />
-                                <column label="Time" name="time"/>
+                                <column label="Zeit" name="time" width="-1" />
                        </scroll_list>
-                        <button label="Weiter &gt;" label_selected="Weiter &gt;" name="Next &gt;"/>
+                        <text name="result_text" />
-                        <button label="&lt; Vorherige" label_selected="&lt; Vorherige" name="&lt; Prev"/>
+                        <button label="Weiter &gt;" label_selected="Weiter &gt;" name="Next &gt;" />
+                        <button label="&lt; Vor" label_selected="&lt; Vor"
+                             name="&lt; Prev" />
                </panel>
                <panel label="Showcase" name="showcase_panel">
                        <string name="searching_text">
@@ -199,13 +238,18 @@
                        </string>
                        <button label="Zurück" name="back_btn"/>
                        <button label="Weiter" name="forward_btn"/>
+        <!-- No mature content checkbox, showcase is all PG -->
+        <web_browser name="showcase_browser" />
+        <text name="status_text" />
                        <string name="loading_text">
                                Wird geladen...
                        </string>
                        <string name="done_text">
                                Fertig
                        </string>
-                </panel>
+        <string name="redirect_404_url">http://secondlife.com/app/search/notfound.html</string>
+        <string name="default_search_page">"http://secondlife.com/app/showcase/index.php?"</string>
+    </panel>
                <panel label="Landverkauf" name="land_sales_panel">
                        <string name="searching_text">
                                Suchen...
@@ -214,15 +258,16 @@
                                Nicht gefunden.
                        </string>
                        <string name="land_help_text">
-                                Land kann direkt für Linden Dollar (L$) oder bei einer Auktion für L$ oder US$ erworben werden.
+                                Land kann direkt für in-Welt Geld oder bei einer Auktion für echtes oder in-Welt Geld erworben werden.
 Um direkt zu kaufen, klicken Sie auf dem betreffenden Land in der Titelleiste auf den Namen.
                        </string>
-                        <text name="find">
+                        <text name="find" v_pad="0" width="50">
-                                Suchen:
+                                Finden:
                        </text>
-                        <check_box label="PG-Inhalt" name="incpg"/>
+                        <check_box control_name="ShowPGLand" label="„PG“-Inhalt" name="incpg" />
-                        <check_box label="Mature-Inhalt" name="incmature"/>
+                        <check_box control_name="ShowMatureLand" label="Inhalt „Reif“" name="incmature" />
-                        <check_box label="Adult-Inhalt" name="incadult"/>
+                        <check_box control_name="ShowAdultLand" label="Inhalt „Erwachsen“" name="incadult" />
+                        <combo_box name="type">
                        <combo_box name="type" width="135">
                                <combo_item name="AllTypes">
                                        Alle Typen
@@ -234,31 +279,33 @@ Um direkt zu kaufen, klicken Sie auf dem betreffenden Land in der Titelleiste au
                                        Verkauf - Mainland
                                </combo_item>
                                <combo_item name="EstateSales">
-                                        Verkauf - Immobilien
+                                        Verkauf - Grundstück
                                </combo_item>
                        </combo_box>
-                        <check_box label="Preis &#8804; " name="pricecheck"/>
+                        <check_box control_name="FindLandPrice" label="Preis &#8804; " name="pricecheck" />
-                        <text left="183" name="pricecheck_symbol">
+                        <text name="pricecheck_symbol">
-                                L$
+        [CURRENCY]
-                        </text>
+      </text>
-                        <check_box label="Gebiet &#8805; " name="areacheck"/>
+                        <check_box control_name="FindLandArea" label="Bereich &#8805; " name="areacheck" />
-                        <text left="183" name="areacheck_symbol">
+                        <text name="areacheck_symbol">
-                                qm
+                                m²
                        </text>
-                        <line_editor left="130" name="priceedit"/>
+                        <line_editor name="priceedit" />
-                        <line_editor left="130" name="areaedit"/>
+                        <line_editor name="areaedit" />
-                        <button label="Suchen" label_selected="Suchen" name="Search"/>
+                        <button label="Suchen" label_selected="Suchen" name="Search" />
                        <scroll_list name="results">
-                                <column label="" name="icon"/>
+                                <column label="" name="icon" width="24" />
-                                <column label="" name="type"/>
+                                <column label="" name="type" width="-1" />
-                                <column label="Name" name="name"/>
+                                <column dynamicwidth="true" label="Name" name="name" />
-                                <column label="Typ" name="landtype"/>
+                                <column label="Type" name="landtype" width="50" />
-                                <column label="L$ Price" name="price"/>
+                                <column label="Preis in [CURRENCY]" name="price" width="65" />
-                                <column label="Area" name="area"/>
+                                <column label="Bereich" name="area" width="50" />
-                                <column label="L$/qm" name="per_meter"/>
+                                <column label="[CURRENCY]/m²" name="per_meter" />
                        </scroll_list>
-                        <button label="Weiter &gt;" label_selected="Weiter &gt;" name="Next &gt;"/>
+                        <text name="result_text" />
-                        <button label="&lt; Vorherige" label_selected="&lt; Vorherige" name="&lt; Prev"/>
+                        <button label="Weiter &gt;" label_selected="Weiter &gt;" name="Next &gt;" />
+                        <button label="&lt; Vor" label_selected="&lt; Vor"
+                             name="&lt; Prev" />
                </panel>
                <panel label="Orte" name="places_panel">
                        <string name="searching_text">
@@ -268,145 +315,163 @@ Um direkt zu kaufen, klicken Sie auf dem betreffenden Land in der Titelleiste au
                                Nicht gefunden.
                        </string>
                        <text name="find">
-                                Suchen:
+                                Finden:
                        </text>
-                        <line_editor name="name"/>
+                        <line_editor name="name" />
-                        <check_box label="PG-Inhalt" name="incpg"/>
+                        <check_box control_name="ShowPGSims" label="„PG“-Inhalt" name="incpg" />
-                        <check_box label="Mature-Inhalt" name="incmature"/>
+                        <check_box control_name="ShowMatureSims" label="Inhalt „Reif“" name="incmature" />
-                        <check_box label="Adult-Inhalt" name="incadult"/>
+                        <check_box control_name="ShowAdultSims" label="Inhalt „Erwachsen“" name="incadult" />
                        <combo_box name="Category">
-                                <combo_item name="AnyCategory">
+                                <combo_item name="AnyCategory" value="any">
                                        Alle Kategorien
                                </combo_item>
-                                <combo_item name="LindenLocation">
+                                <combo_item name="LindenLocation" value="linden">
-                                        Lindenort
+                                        Linden-Position
                                </combo_item>
-                                <combo_item name="Arts&amp;Culture">
+                                <combo_item name="Arts&amp;Culture" value="arts">
-                                        Kunst und Kultur
+                                        Kunst &amp; Kultur
                                </combo_item>
-                                <combo_item name="Business">
+                                <combo_item name="Business" value="store">
-                                        Business
+                                        Gewerbe
                                </combo_item>
-                                <combo_item name="Educational">
+                                <combo_item name="Educational" value="educational">
                                        Bildung
                                </combo_item>
-                                <combo_item name="Gaming">
+                                <combo_item name="Gaming" value="game">
                                        Spielen
                                </combo_item>
-                                <combo_item name="Hangout">
+                                <combo_item name="Hangout" value="gather">
                                        Treffpunkt
                                </combo_item>
-                                <combo_item name="NewcomerFriendly">
+                                <combo_item name="NewcomerFriendly" value="newcomer">
                                        Anfängergerecht
                                </combo_item>
-                                <combo_item name="Parks&amp;Nature">
+                                <combo_item name="Parks&amp;Nature" value="park">
-                                        Parks und Natur
+                                        Parks &amp; Natur
                                </combo_item>
-                                <combo_item name="Residential">
+                                <combo_item name="Residential" value="home">
                                        Wohngebiet
                                </combo_item>
-                                <combo_item name="Shopping">
+                                <combo_item name="Shopping" value="shopping">
-                                        Shopping
+                                        Einkaufen
                                </combo_item>
-                                <combo_item name="Other">
+                                <combo_item name="Other" value="other">
                                        Sonstige
                                </combo_item>
                        </combo_box>
-                        <combo_box name="Category_Adult">
+                        <!-- This is used only during the AO transition and can be deleted once the AO transition is
-                                <combo_item name="AnyCategory">
+                        complete. It is identical to the combo box above except that it has the Adult category. 
+                        You might also want to set it back to default visible and enabled. -->
+                        <combo_box allow_text_entry="false" bottom="-46" enabled="false" follows="right|top" height="18" left="230"
+                             max_chars="20" mouse_opaque="true" name="Category_Adult" width="128" visible="false">
+                                <combo_item name="AnyCategory" value="any">
                                        Alle Kategorien
                                </combo_item>
-                                <combo_item name="LindenLocation">
+                                <combo_item name="LindenLocation" value="linden">
-                                        Lindenort
+                                        Linden-Position
                                </combo_item>
-                                <combo_item name="Adult">
+                                <combo_item name="Adult" value="adult">
-                                        Adult
+                                        Erwachsen
                                </combo_item>
-                                <combo_item name="Arts&amp;Culture">
+                                <combo_item name="Arts&amp;Culture" value="arts">
                                        Kunst &amp; Kultur
                                </combo_item>
-                                <combo_item name="Business">
+                                <combo_item name="Business" value="store">
-                                        Business
+                                        Gewerbe
                                </combo_item>
-                                <combo_item name="Educational">
+                                <combo_item name="Educational" value="educational">
                                        Bildung
                                </combo_item>
-                                <combo_item name="Gaming">
+                                <combo_item name="Gaming" value="game">
                                        Spielen
                                </combo_item>
-                                <combo_item name="Hangout">
+                                <combo_item name="Hangout" value="gather">
                                        Treffpunkt
                                </combo_item>
-                                <combo_item name="NewcomerFriendly">
+                                <combo_item name="NewcomerFriendly" value="newcomer">
                                        Anfängergerecht
                                </combo_item>
-                                <combo_item name="Parks&amp;Nature">
+                                <combo_item name="Parks&amp;Nature" value="park">
-                                        Parks und Natur
+                                        Parks &amp; Natur
                                </combo_item>
-                                <combo_item name="Residential">
+                                <combo_item name="Residential" value="home">
                                        Wohngebiet
                                </combo_item>
-                                <combo_item name="Shopping">
+                                <combo_item name="Shopping" value="shopping">
-                                        Shopping
+                                        Einkaufen
                                </combo_item>
-                                <combo_item name="Other">
+                                <combo_item name="Other" value="other">
                                        Sonstige
                                </combo_item>
                        </combo_box>
-                        <button label="Suchen" label_selected="Suchen" name="Search"/>
+                        <button label="Suchen" label_selected="Suchen" name="Search" />
                        <scroll_list name="results">
-                                <column label="" name="icon"/>
+                                <column label="" name="icon" width="24" />
-                                <column label="" name="type"/>
+                                <column label="" name="type" width="-1" />
-                                <column label="Name" name="name"/>
+                                <column dynamicwidth="true" label="Name" name="name" />
-                                <column label="Traffic" name="dwell"/>
+                                <column label="Traffic" name="dwell" width="75" />
                        </scroll_list>
-                        <button label="Weiter &gt;" label_selected="Weiter &gt;" name="Next &gt;"/>
+                        <text name="result_text" />
-                        <button label="&lt; Vorherige" label_selected="&lt; Vorherige" name="&lt; Prev"/>
+                        <button label="Weiter &gt;" label_selected="Weiter &gt;" name="Next &gt;" />
+                        <button label="&lt; Vor" label_selected="&lt; Vor"
+                             name="&lt; Prev" />
                </panel>
-                <panel label="Leute" name="people_panel">
+    <panel label="Leute" name="people_panel">
                        <string name="searching_text">
                                Suchen...
                        </string>
                        <string name="not_found_text">
                                Nicht gefunden.
                        </string>
-                        <text left_delta="38" name="find">
+      <text name="find">
-                                Suchen:
+        Finden:
-                        </text>
+      </text>
-                        <line_editor left_delta="48" name="name"/>
+          <line_editor name="name" />
-                        <button label="Suchen" label_selected="Suchen" name="Search"/>
+                <button label="Suchen" label_selected="Suchen" name="Search" />
-                        <scroll_list name="results" width="286">
+      <scroll_list name="results">
-                                <column label="" name="icon"/>
+        <column label="" name="icon" width="24" />
-                                <column label="" name="type"/>
+        <column label="" name="type" width="-1" />
-                                <column label="Name" name="name" width="234"/>
+        <column label="Name" name="name" width="274" />
-                        </scroll_list>
+      </scroll_list>
-                        <button right="290" label="Weiter &gt;" label_selected="Weiter &gt;" name="Next &gt;"/>
+                        <text name="result_text" />
-                        <button right="204" label="&lt; Vorherige" label_selected="&lt; Vorherige" name="&lt; Prev"/>
+                        <button label="Weiter &gt;" label_selected="Weiter &gt;" name="Next &gt;" />
+                <button label="&lt; Vor" label_selected="&lt; Vor"
+                             name="&lt; Prev" />
                </panel>
-                <panel label="Gruppen" name="groups_panel">
+    <panel label="Gruppen" name="groups_panel">
                        <string name="searching_text">
                                Suchen...
                        </string>
                        <string name="not_found_text">
                                Nicht gefunden.
                        </string>
-                        <text left_delta="38" name="find">
+                        <button label="Weiter &gt;" label_selected="Weiter &gt;" name="Next &gt;" />
-                                Suchen:
+                <button label="&lt; Vor" label_selected="&lt; Vor"
+                             name="&lt; Prev" />
+                        <text name="find">
+                                Finden:
                        </text>
-                        <line_editor label="Suchen" name="search_editor" tool_tip="Second Life durchsuchen"/>
+                        <line_editor name="name" />
-                        <button label="Zurück" name="back_btn"/>
+                        <button label="Suchen" label_selected="Suchen" name="Search" />
-                        <button label="Weiter" name="forward_btn"/>
+                        <check_box control_name="ShowPGGroups" label="„PG“-Inhalt" name="incpg" />
-                        <button label="Suchen" name="search_btn"/>
+                        <check_box control_name="ShowMatureGroups" label="Inhalt „Reif“" name="incmature" />
-                        <check_box label="PG-Inhalt" name="incpg"/>
+                        <check_box control_name="ShowAdultGroups" label="Inhalt „Erwachsen“" name="incadult" />
-                        <check_box label="Mature-Inhalt" name="incmature"/>
+                        <scroll_list name="results">
-                        <check_box label="Adult-Inhalt" name="incadult"/>
+                                <column label="" name="icon" sort="score" sort_ascending="false" width="24" />
-                        <string name="loading_text">
+                                <column label="" name="type" width="-1" />
-                                Wird geladen...
+                                <column dynamicwidth="true" label="Name" name="name" />
-                        </string>
+                                <column label="Mitglieder" name="members" />
-                        <string name="done_text">
+                                <column label="" name="score" width="-1" />
-                                Fertig
+                        </scroll_list>
-                        </string>
+                        <text name="result_text" />
                </panel>
        </tab_container>
-        <panel left="310" name="Panel Avatar" width="470" />
+        <panel name="classified_details_panel" />
+        <panel name="Panel Avatar" />
+        <panel name="event_details_panel" />
+        <panel name="group_details_panel_holder" />
+        <panel name="group_details_panel" />
+        </panel>
+        <panel name="place_details_panel" />
+        <panel name="place_details_small_panel" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_env_settings.xml b/linden/indra/newview/skins/default/xui/de/floater_env_settings.xml
index 3717ff6..923b9af 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_env_settings.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_env_settings.xml
@@ -4,7 +4,7 @@
                Tageszeit
        </text>
        <text name="EnvTimeText2">
-                12:00
+                Tageszeit
        </text>
        <text name="EnvCloudText">
                Wolkendecke
diff --git a/linden/indra/newview/skins/default/xui/de/floater_font_test.xml b/linden/indra/newview/skins/default/xui/de/floater_font_test.xml
index 54278fc..cea1fd4 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_font_test.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_font_test.xml
@@ -1,5 +1,90 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="contents" title="Schriftart-Test">
+<text font="SansSerif">
+SansSerif, keine Größe oder Stil (sollte gleich medium sein)
+</text>
+<text font="SansSerifLarge" follows="left|top|right" bottom_delta="-20" left="16" height="16">
+SansSerifGroß
+</text>
+<text font="SansSerifHuge" follows="left|top|right" bottom_delta="-36" left="16" height="32">
+SansSerifExtraGroß
+</text>
+<text font="Monospace" follows="left|top|right" bottom_delta="-20" left="16" height="16" font_size="Large">
+Monospace Größe=Groß
+</text>
+<text font="SansSerifLarge" follows="left|top|right" bottom_delta="-20" left="16" height="16" font_style="BOLD">
+SansSerifGroß Stil=FETT 
+</text>
+<text font="SansSerifBold" follows="left|top|right" bottom_delta="-20" left="16" height="16">
+SansSerifFett
+</text>
+<text font="SansSerif" follows="left|top|right" bottom_delta="-20" left="16" height="16" font_style="BOLD">
+SansSerif Stil=FETT (sollte gleich SansSerifFett sein)
+</text>
+<text font="SansSerif" follows="left|top|right" bottom_delta="-20" left="16" height="16" font-style="ITALIC">
+SansSerif Stil=KURSIV
+</text>
+<text font="SansSerif" follows="left|top|right" bottom_delta="-20" left="16" height="16" font-style="BOLD|ITALIC">
+SansSerif Stil=FETT|KURSIV 
+</text>
+<text font="SansSerif" follows="left|top|right" bottom_delta="-20" left="16" height="16" font-style="BOLD|ITALIC|DROP_SHADOW_SOFT">
+SansSerif Stil=FETT|KURSIV|SANFTER_SCHATTEN
+</text>
+<text font="SansSerif" follows="left|top|right" bottom_delta="-20" left="16" height="16" font-style="UNDERLINE">
+SansSerif Stil=UNTERSTRICHEN
+</text>
+<text font="SansSerif" follows="left|top|right" bottom_delta="-20" left="16" height="16" font-style="DROP_SHADOW">
+SansSerif Stil=SCHATTEN
+</text>
+<text font="SansSerif" follows="left|top|right" bottom_delta="-20" left="16" height="16" font-style="DROP_SHADOW_SOFT">
+SansSerif Stil=SANFTER_SCHATTEN
+</text>
+<text font="DejaVu" follows="left|top|right" bottom_delta="-20" left="16" height="16" font-style="BOLD">
+DejaVu Stil=FETT
+</text>
+<text font="DejaVu" follows="left|top|right" bottom_delta="-20" left="16" height="16" font-style="ITALIC">
+DejaVu Stil=KURSIV
+</text>
+<text font="DejaVu" follows="left|top|right" bottom_delta="-20" left="16" height="16" font-style="BOLD|ITALIC">
+DejaVu Stil=FETT|KURSIV
+</text>
+<text font="DejaVu" follows="left|top|right" bottom_delta="-20" left="16" height="16" font_size="Large" font-style="BOLD|ITALIC">
+DejaVu Größe=Groß Stil=FETT|KURSIV
+</text>
+<text font="Helvetica" follows="left|top|right" bottom_delta="-20" left="16" height="16" font-style="BOLD">
+Helvetica Stil=FETT 
+</text>
+<text font="Helvetica" follows="left|top|right" bottom_delta="-20" left="16" height="16" font-style="ITALIC">
+Helvetica Stil=KURSIV 
+</text>
+<text font="Helvetica" follows="left|top|right" bottom_delta="-20" left="16" height="16" font-style="BOLD|ITALIC">
+Helvetica Stil=FETT|KURSIV
+</text>
+<text font="Helvetica" follows="left|top|right" bottom_delta="-20" left="16" height="16" font_size="Large" font-style="BOLD|ITALIC">
+Helvetica Größe=Groß Stil=FETT|KURSIV
+</text>
        <text name="linea">
                OverrideTest, sollte hier als Times angezeigt werden. (Aus default/xui/en-us)
        </text>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_gesture.xml b/linden/indra/newview/skins/default/xui/de/floater_gesture.xml
index bdee3b8..bccd66f 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_gesture.xml
@@ -4,8 +4,8 @@
                Doppelklicken Sie auf eine Geste, um Animationen und Sound &#10;abzuspielen.
        </text>
        <scroll_list bottom_delta="-385" height="360" name="gesture_list">
-                <column label="Trigger" name="trigger" />
+                <column label="Auslöser" name="trigger" />
-                <column label="Key" name="shortcut" />
+                <column label="Schlüssel" name="shortcut" />
                <column label="" name="key" />
                <column label="Name" name="name" />
        </scroll_list>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_god_tools.xml b/linden/indra/newview/skins/default/xui/de/floater_god_tools.xml
index dcb6982..a96aeae 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_god_tools.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_god_tools.xml
@@ -12,11 +12,11 @@
                        <text name="Sim Name:" width="55">
                                Sim-Name:
                        </text>
-                        <check_box label="Startbereich Einleitung" name="check prelude"
+                        <check_box label="Startbereich" name="check prelude"
                             tool_tip="Diese Region zu einem Startbereich machen." />
                        <check_box label="Sonne fest" name="check fixed sun"
                             tool_tip="Fixiert den Sonnenstand (wie in „Region/Grundstück“ &gt; „Terrain“." />
-                        <check_box label="Zuhause auf Teleport &#10;zurücksetzen" name="check reset home"
+                        <check_box label="Zuhause bei Teleport &#10;zurücksetzen" name="check reset home"
                             tool_tip="Wenn Einwohner wegteleportieren, ihr Zuhause auf Zielposition setzen." height="32" />
                        <check_box label="Sichtbar" name="check visible"
                             tool_tip="Diese Region für Nicht-Götter sichtbar machen." bottom_delta="-32" />
@@ -25,7 +25,7 @@
                        <check_box label="Trafficüberwachung blockieren" name="block dwell"
                             tool_tip="In dieser Region die Traffic-Berechnung abschalten." />
                        <check_box label="Terraformen blockieren" name="block terraform"
-                             tool_tip="Das Terraformen von Land verbieten (Benutzen Sie dies um Leuten das Terraformen ihres Landes zu verbieten)" />
+                             tool_tip="Das Terraformen von Land verbieten (Benutzen Sie dies, um Leuten das Terraformen ihres Landes zu verbieten)" />
                        <check_box label="Sandkasten" name="is sandbox"
                             tool_tip="Sandkastenregion ein-/ausschalten." />
                        <button label="Terrain formen" label_selected="Terrain formen" name="Bake Terrain"
@@ -56,7 +56,7 @@
                                Abrechnungsfaktor:
                        </text>
                        <text name="land cost text">
-                                L$ pro qm:
+                                 [CURRENCY] pro qm:
                        </text>
                        <button label="Aktualisieren" label_selected="Aktualisieren" name="Refresh"
                             tool_tip="Klicken Sie hier, um die obigen Informationen zu aktualisieren." />
@@ -76,8 +76,8 @@
                        <text name="region name">
                                Welsh
                        </text>
-                        <check_box label="Skripts &#10;deaktivieren" name="disable scripts"
+                        <check_box label="Skripte &#10;deaktivieren" name="disable scripts"
-                             tool_tip="Skripts in dieser Region komplett abschalten" />
+                             tool_tip="Skripte in dieser Region komplett abschalten" />
                        <check_box label="Kollisionen &#10;deaktivieren" name="disable collisions"
                             tool_tip="Nicht-Avatar-Kollisionen in dieser Region komplett abschalten" />
                        <check_box label="Physik deaktivieren" name="disable physics"
@@ -96,7 +96,7 @@
                        <button label="Geskriptete Objekte des Ziels auf *allen* Ländern löschen"
                             label_selected="Geskriptete Objekte des Ziels auf *allen* Ländern löschen"
                             name="Delete Target&apos;s Scripted Objects On *Any* Land"
-                             tool_tip="Alle dem Ziel gehörenden geskripteten Objekte in dieser Region löschen. Objekte (nicht kopierfähig) werden zurückgegeben." />
+                             tool_tip="Alle dem Ziel gehörenden geskripteten Objekte auf Land, das nicht dem Ziel gehört löschen. Objekte (nicht kopierfähig) werden zurückgegeben." />
                        <button label="*ALLE* Objekte des Ziels löschen"
                             label_selected="*ALLE* Objekte des Ziels löschen"
                             name="Delete *ALL* Of Target&apos;s Objects"
@@ -104,11 +104,11 @@
                        <button label="Top-Kollisionsobjekte" label_selected="Top-Kollisionsobjekte"
                             name="Get Top Colliders"
                             tool_tip="Zeigt eine Liste der Objekte mit den meisten Callbacks in der nahen Phase an." width="130" />
-                        <button label="Top-Skripts" label_selected="Top-Skripts" name="Get Top Scripts"
+                        <button label="Top-Skripte" label_selected="Top-Skripte" name="Get Top Scripts"
-                             tool_tip="Zeigt eine Liste der Objekte an, die die meiste Zeit über Skripts ausführen." width="130" />
+                             tool_tip="Zeigt eine Liste der Objekte an, die die meiste Zeit über Skripte ausführen." width="130" />
-                        <button label="Scripting-Übersicht" label_selected="Scripting-Übersicht"
+                        <button label="Skripte-Übersicht" label_selected="Skripte-Übersicht"
                             name="Scripts digest"
-                             tool_tip="Zeigt eine Liste aller Skripts mit Häufigkeit an." width="130" />
+                             tool_tip="Zeigt eine Liste aller Skripte mit Häufigkeit an." width="130" />
                </panel>
                <panel label="Anfrage" name="request">
                        <text name="Destination:">
@@ -130,7 +130,7 @@
                                        Kollisionsobjekte &lt;Schritte&gt;
                                </combo_item>
                                <combo_item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;">
-                                        Skripts &lt;Zähler&gt;,&lt;Optionales Muster&gt;
+                                        Skripte &lt;Zähler&gt;,&lt;Optionales Muster&gt;
                                </combo_item>
                                <combo_item name="objects&lt;pattern&gt;">
                                        Objekte &lt;Muster&gt;
@@ -142,7 +142,7 @@
                        <text name="Parameter:">
                                Parameter:
                        </text>
-                        <button label="Anfrage" label_selected="Anfrage" name="Make Request" />
+                        <button label="Anfragen" label_selected="Anfragen" name="Make Request" />
                </panel>
        </tab_container>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_grid_default_selector.xml b/linden/indra/newview/skins/default/xui/de/floater_grid_default_selector.xml
new file mode 100644
index 0000000..21a4b36
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/de/floater_grid_default_selector.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="default_grid"
+     title="Ein Standard-Netz aussuchen">
+  <text name="select_label">
+    Oder den Netz-Manager benutzen, um ein neues hinzuzufügen
+  </text>
+  <button label="Abbrechen" name="btn_cancel" />
+  <button label="OK" name="btn_ok" />
+</floater>
+\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/de/floater_grid_manager.xml b/linden/indra/newview/skins/default/xui/de/floater_grid_manager.xml
new file mode 100644
index 0000000..dee3233
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/de/floater_grid_manager.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_login" title="Netz-Manager">
+  <!-- Grid Selector -->
+  <text name="grid_selector_label">
+    Netz aussuchen:
+  </text>
+  
+  <scroll_list name="grid_selector">
+    <column label="Netzliste" name="grid" />
+  </scroll_list>
+  
+  <!-- Grid Selector Buttons -->
+  <button label="Neues Netz" name="btn_add" />
+  <button label="Netz kopieren" name="btn_copy" />
+  <button label="Netz löschen" name="btn_delete" />
+  <!-- Grid Details -->
+  <text name="gridnick_text">
+    Netzname:
+  </text>
+  <!--
+  <text name="first_name_text">
+                Vorname:
+        </text>
+  <text name="last_name_text">
+    Nachname:
+  </text>
+  <text name="avatar_password_text">
+                Passwort:
+        </text>
+  <text name="start_location_text">
+    Startort:
+  </text>
+  <combo_box name="start_location_combo">
+    <combo_item name="MyHome" value="My Home">
+      Meine Heimat
+    </combo_item>
+    <combo_item name="MyLastLocation" value="My Last Location">
+      Mein letzter Ort
+    </combo_item>
+    <combo_item name="Typeregionname" value="&lt;Type region name&gt;">
+      &lt;Regionsname eingeben&gt;
+    </combo_item>
+  </combo_box>
+  -->
+  <text name="loginuri_text">
+    Einwahl-URI:
+  </text>
+  <button label="Netzinfo holen" name="btn_gridinfo" />
+  <button label="Info löschen" name="btn_clear" />
+  <text name="loginpage_text">
+    Netzinfo URLs:
+  </text>
+  <text name="loginpage_text">
+    Einwahl-Seite:
+  </text>
+  <text name="helperuri_text">
+    Helfer-URI:
+  </text>
+  <text name="website_text">
+    Internet-Seite:
+  </text>
+  <text name="support_text">
+    Support:
+  </text>
+  <text name="register_text">
+    Konto:
+  </text>
+  <text name="password_text">
+    Passwort:
+  </text>
+  <text name="websearch_text">
+    Internetsuche:
+  </text>
+  <!-- Combo box for multi avatar grid manager avatar name
+        <combo_box name="name_combo" />
+  -->
+  <!-- Buttons for multi avatar grid manager
+  <button label="Neu" label_selected="Neu" name="new_btn" />
+  -->
+  <!--
+  <button label="Löschen" label_selected="Löschen" name="remove_btn" />
+-->
+  <!-- Checkbox for selecting a global avatar (for when combo box avatar selector works)
+  <check_box label="Globaler Avatar" name="global_check" />
+  <check_box label="Passwort behalten" name="remember_check" />
+  <check_box label="Geheimgrad" name="gawd_mode" />
+  -->
+  <!-- Cancel/Connect Buttons -->
+  <!--
+  <button label="Als Standard setzen" label_selected="Als Standard setzen" name="set_default" />
+  -->
+  <!-- <button label="Verbinden" label_selected="Verbinden" name="connect_btn" />  -->
+  <button label="Übernehmen" label_selected="Übernehmen" name="btn_apply" />
+  <button label="Abbrechen" label_selected="Abrechen" name="btn_cancel" />
+  <button label="OK" label_selected="OK" name="btn_ok" />
+  <!--
+        <combo_box name="server_combo" />
+  -->
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_group_info.xml b/linden/indra/newview/skins/default/xui/de/floater_group_info.xml
index ff5abe9..d1c5163 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_group_info.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_group_info.xml
@@ -15,10 +15,10 @@
                                Jede Person kann eine Gruppe erstellen. Eine Person kann maximal zu 15 Gruppen gehören.
                        </text>
                        <text name="txt4">
-                                Gruppen müssen aus mindestens 3 Mitgliedern bestehen.
+                                Aktive Gruppen müssen aus mindestens 3 Mitgliedern bestehen.
                        </text>
                        <text name="group_create_text">
-                                Die Gründung einer Gruppe kostet 100 L$.
+                                Die Gründung einer Gruppe kostet 100 [CURRENCY].
                        </text>
                        <text name="lbl">
                                Name:
@@ -33,20 +33,20 @@
                        <check_box label="Mitglieder in Gruppenliste anzeigen" name="sho_mem"/>
                        <check_box label="Im Web veröffentlichen." name="allow_publish" tool_tip="Veröffentlicht Ihre Profilinformationen im Web."/>
                        <button label="?" label_selected="?" name="publish_help_btn"/>
-                        <check_box label="Mature" name="mature" tool_tip="Ihre Profilinformationen sind als „Mature“ gekennzeichnet."/>
+                        <check_box label="Reif" name="mature" tool_tip="Ihre Profilinformationen sind als „Reif“ gekennzeichnet."/>
                </panel>
                <panel label="Titel" name="tit">
                        <text name="txt">
                                Gruppentitel
                        </text>
                        <text name="txt2">
-                                Gruppen können Officer und Mitglieder haben, jeweils mit besonderen Titeln.
+                                Gruppen können Offiziere und Mitglieder haben, jeweils mit besonderen Titeln.
                        </text>
                        <text name="txt3">
                                Die Titel werden in der Welt, beim Chat und in IM vor dem Namen angezeigt.
                        </text>
                        <text name="lbl">
-                                Officer-Titel:
+                                Offizierstitel:
                        </text>
                        <text name="lbl2">
                                Mitgliedstitel:
@@ -61,13 +61,13 @@
                                Gruppenmitglieder
                        </text>
                        <text name="txt2">
-                                Aktuelle Officers und Gruppenmitglieder.
+                                Aktuelle Offiziere und Gruppenmitglieder.
                        </text>
                        <text name="txt3">
                                Klicken Sie auf einen Namen, um das Mitgliedsprofil anzuzeigen.
                        </text>
                        <text name="lbl">
-                                Officers:
+                                Offiziere:
                        </text>
                        <text name="members_label">
                                Mitglieder:
@@ -82,7 +82,7 @@
                                        </text>
                                        <text name="instructions">
                                                Klicken Sie auf „Wahl starten“, um eine neue Wahl zu starten. 
-Zu den Kandidaten gehören alle Mitglieder, die keine Officer sind.
+Zu den Kandidaten gehören alle Mitglieder, die keine Offiziere sind.
                                        </text>
                                        <text name="lbl">
                                                Kandidaten:
@@ -100,7 +100,7 @@ Zu den Kandidaten gehören alle Mitglieder, die keine Officer sind.
                                        <text name="lbl3">
                                                Mehrheit:
                                        </text>
-                                        <radio_group name="majority" tool_tip="Majority of total votes needed to win.">
+                                        <radio_group name="majority" tool_tip="Mehrheit aller Stimmen zum Gewinn benötigt.">
                                                <radio_item name="radio">
                                                        Einfache Mehrheit
                                                </radio_item>
@@ -116,7 +116,7 @@ Zu den Kandidaten gehören alle Mitglieder, die keine Officer sind.
                                        </text>
                                        <spinner name="duration" tool_tip="# Tage bis zum Ende der Wahl."/>
                                        <text name="duration_days">
-                                                Tage
+                                                Tag
                                        </text>
                                        <text name="start_lbl">
                                                Beginn der Wahl:
@@ -130,7 +130,7 @@ Zu den Kandidaten gehören alle Mitglieder, die keine Officer sind.
                                                Gruppenanfragen
                                        </text>
                                        <text name="instructions">
-                                                Keine aktiven Anfragen.  Klicken Sie auf „Neue Anfrage“,
+                                                Keine aktiven Anfragen. Klicken Sie auf „Neue Anfrage“,
 um eine neue Anfrage zu erstellen.
                                        </text>
                                        <text name="proposal_lbl">
@@ -153,7 +153,7 @@ um eine neue Anfrage zu erstellen.
                                        <text name="majority_lbl">
                                                Mehrheit:
                                        </text>
-                                        <radio_group name="majority" tool_tip="Majority of total votes needed to win.">
+                                        <radio_group name="majority" tool_tip="Mehrheit aller Stimmen zum Gewinn benötigt.">
                                                <radio_item name="radio">
                                                        Einfache Mehrheit
                                                </radio_item>
@@ -183,7 +183,7 @@ um eine neue Anfrage zu erstellen.
                                                Alte Gruppenabstimmungen
                                        </text>
                                        <text name="instructions">
-                                                Sie können die Abstimmergebisse anzeigen, indem Sie die Abstimmung auswählen und auf
+                                                Sie können alte Abstimmergebisse anzeigen, indem Sie die Abstimmung auswählen und auf
                                        </text>
                                        <text name="instructions2">
                                                „Objekt anzeigen“ klicken.
@@ -210,9 +210,9 @@ um eine neue Anfrage zu erstellen.
                                Klicken Sie auf „Hinzufügen“, um Benutzer zur Liste hinzuzufügen.
                        </text>
                        <text name="lbl">
-                                Officers:
+                                Offiziere:
                        </text>
-                        <button label="Officer hinzufügen..." label_selected="Officer hinzufügen..." name="add_officer_btn"/>
+                        <button label="Offiziere hinzufügen..." label_selected="Officer hinzufügen..." name="add_officer_btn"/>
                        <button label="Auswahl entfernen" label_selected="Auswahl entfernen" name="remove_officer_btn"/>
                        <text name="lbl2">
                                Mitglieder:
@@ -222,7 +222,7 @@ um eine neue Anfrage zu erstellen.
                        <text name="lbl3">
                                Beitrittsgebühr:
                        </text>
-                        <check_box label="Freier Beitritt (kein Einladung nötig)" name="open"/>
+                        <check_box label="Freier Beitritt (keine Einladung nötig)" name="open"/>
                </panel>
                <panel label="Land" name="land">
                        <text name="txt">
@@ -245,7 +245,8 @@ um eine neue Anfrage zu erstellen.
                </panel>
                <panel label="Geld" name="mon">
                        <tab_container name="group money history tab">
-                                <panel label="Planung" name="money panel"/>
+                                <panel label="Planung" name="money panel" />
+                                </panel>
                                <panel label="Details" name="money panel2">
                                        <button label="&lt; Früher" label_selected="&lt; Früher" name="&lt; Earlier" tool_tip="Zurück in der Zeit"/>
                                        <button label="Später &gt;" label_selected="Später &gt;" name="Later &gt;" tool_tip="Weiter in der Zeit"/>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_group_titles.xml b/linden/indra/newview/skins/default/xui/de/floater_group_titles.xml
new file mode 100644
index 0000000..4d3430d
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/de/floater_group_titles.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="goup titles" title="Gruppentitel">
+        <scroll_list name="titles_list">
+                <column name="title" label="Titel"/>
+                <column name="group_name" label="Gruppe" />
+        </scroll_list>
+        <button name="activate" label="Aktivieren" tool_tip="Den gewünschten Gruppentitel aktivieren" />
+</floater>
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 37f9ea5..7bf1bad 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_html.xml
@@ -2,7 +2,6 @@
 <floater name="htmlfloater" title="">
        <button label="Schließen" name="close_btn" />
        <button label="Zurück" name="back_btn" />
-        <button label="Zuhause" name="home_btn" />
        <button label="Weiter" name="forward_btn" />
        <button label="Los" name="go_btn" />
        <string name="home_page_url">
diff --git a/linden/indra/newview/skins/default/xui/de/floater_image_preview.xml b/linden/indra/newview/skins/default/xui/de/floater_image_preview.xml
index 145e0bb..a851da8 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_image_preview.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_image_preview.xml
@@ -47,6 +47,7 @@
 Speichern Sie das Bild als 24 Bit Targa (.tga).
        </text>
        <check_box label="Verlustfreie Komprimierung verwenden" name="lossless_check" />
+        <check_box label="Temporäres Bild (Kostenlos)" name="temp_check" tooltip="Setzt die Speicherung auf temporär. Damit ist das Bild kostenlos, aber verschwindet nach einer kurzen Zeit." />
        <button label="Abbrechen" name="cancel_btn" />
-        <button label="Hochladen ([AMOUNT] L$)" name="ok_btn" />
+        <button label="Hochladen ([UPLOADFEE])" name="ok_btn" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_inspect.xml b/linden/indra/newview/skins/default/xui/de/floater_inspect.xml
index f8c9b62..d27ac9d 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_inspect.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_inspect.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="inspect" title="Objekt prüfen" min_width="450" >
        <scroll_list name="object_list"
-             tool_tip="Wählen Sie ein Objekt aus dieser Liste, um es in der Second Life-Welt zu markieren">
+             tool_tip="Wählen Sie ein Objekt aus dieser Liste, um es in der Welt zu markieren">
                <column label="Objektname" name="object_name" />
                <column label="Besitzer" name="owner_name"  />
                <column label="Ersteller" name="creator_name" />
diff --git a/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml
index 1e926c4..fb40e39 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml
@@ -33,9 +33,25 @@
        <string name="unavailable_text_label">
                Für diese Verbindung ist kein Text-Chat verfügbar.
        </string>
+        <string name="add_friend_string">
+                Freund hinzufügen
+        </string>
        <flyout_button label="Profil..." name="profile_callee_btn"/>
+    <flyout_button_item name="history_entry">
+      Verlauf anzeigen
+    </flyout_button_item>
+    <flyout_button_item name="pay_entry">
+      Bezahlen
+    </flyout_button_item>
+    <flyout_button_name="teleport_entry">
+     Teleport anbieten
+    </flyout_button_item>
+  </flyout_button>
        <button label="Anrufen" name="start_call_btn" pad_right="7" width="115"/>
        <button halign="right" label="Anruf beenden" name="end_call_btn" width="115"/>
+  <text name="inventory_send">
+    Inventar hier hereinziehen (Drag & Drop), um es zu senden
+  </text>
        <panel left_delta="111" name="speaker_controls">
                <button label="" name="mute_btn" tool_tip="Voice stummschalten"/>
        </panel>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/default/xui/de/floater_instant_message_ad_hoc.xml
index 7588d56..a3ad922 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_instant_message_ad_hoc.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_instant_message_ad_hoc.xml
@@ -1,29 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater label="(unbekannt)" name="im_floater" title="(unbekannt)">
-        <layout_stack name="panels">
-                <layout_panel name="im_contents_panel">
-                        <button label="Anrufen" name="start_call_btn" width="145" />
-                        <button label="Anruf beenden" name="end_call_btn" width="145"/>
-                        <button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Klicken Sie hier um eine Liste der aktiven Teilnehmer dieser IM-Sitzung anzuzeigen."/>
-                        <line_editor label="Für Instant Message hier klicken" name="chat_editor"/>
-                        <button label="Senden" name="send_btn"/>
-                </layout_panel>
-                <layout_panel name="active_speakers_panel">
-                        <scroll_list name="speakers_list">
-                                <column label="Name" name="speaker_name"/>
-                        </scroll_list>
-                        <panel name="volume_container">
-                                <text name="resident_name">
-                                        Rumpelstilzchen Megakrass
-                                </text>
-                                <text name="Mute:">
-                                        Stummschalten:
-                                </text>
-                                <check_box label="Text" name="mute_text_btn"/>
-                                <check_box label="Sprache" name="mute_btn"/>
-                        </panel>
-                </layout_panel>
-        </layout_stack>
        <string name="ringing">
                Voice-Chat wird beigetreten...
        </string>
@@ -36,22 +12,32 @@
        <string name="voice_icon">
                icn_voice-groupfocus.tga
        </string>
+        <string name="title_string">
+                Instant Message an [NAME]
+        </string>
+        <string name="typing_start_string">
+                [NAME] tippt...
+        </string>
+        <string name="session_start_string">
+                Beginne Sitzung mit [NAME], bitte warten.
+        </string>
        <string name="default_text_label">
                Für Instant Message hier klicken.
        </string>
-        <text name="live_help_dialog">
+        <layout_stack name="panels">
+                <layout_panel name="im_contents_panel">
+                        <button label="Anrufen" name="start_call_btn" width="145" />
+                        <button label="Anruf beenden" name="end_call_btn" width="145"/>
+                        <button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Klicken Sie hier, um eine Liste der aktiven Teilnehmer dieser IM-Sitzung anzuzeigen."/>
+                        <line_editor label="Für Instant Message hier klicken" name="chat_editor"/>
+                        <button label="Senden" name="send_btn"/>
+                </layout_panel>
+                <layout_panel name="active_speakers_panel" />
+        </layout_stack>
+        <string name="live_help_dialog">
                *** Willkommen bei Help Request ***  
 Bitte werfen Sie zuerst einen Blick auf unsere SL-Hilfeseiten. Drücken Sie dazu F1. Oder rufen Sie unter http://secondlife.com/knowledgebase/ die Knowledge Base auf. 
 Falls Sie die gesuchte Antwort dort nicht finden, geben Sie Ihre Frage ein. Warten Sie dann einen Moment, bis ein verfügbarer Helfer antwortet.
 -=-=- Die Antwortzeiten variieren. Insbesondere zur Hauptbetriebszeit kann die Antwort etwas länger dauern. -=-=-
-        </text>
+        </string>
-        <text name="title_string">
-                Instant Message an [NAME]
-        </text>
-        <text name="typing_start_string">
-                [NAME] tippt...
-        </text>
-        <text name="session_start_string">
-                Beginne Sitzung mit [NAME], bitte warten.
-        </text>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/de/floater_instant_message_group.xml
index 12d71a6..04a8b08 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_instant_message_group.xml
@@ -1,45 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater label="(unbekannt)" name="im_floater" title="(unbekannt)" min_width="426" >
-        <layout_stack name="panels">
-                <layout_panel name="im_contents_panel">
-                        <button label="Gruppeninfo" name="group_info_btn" width="85"/>
-                        <button label="Gespräch beitreten" left_delta="90" name="start_call_btn" width="145"/>
-                        <button halign="center" label="Anruf beenden" name="end_call_btn" width="145"/>
-                        <button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Klicken Sie hier um eine Liste der aktiven Teilnehmer dieser IM-Sitzung anzuzeigen."/>
-                        <line_editor label="Für Instant Message hier klicken" name="chat_editor"/>
-                        <button label="Senden" name="send_btn"/>
-                        <text name="live_help_dialog">
-                                *** Willkommen bei Help Request ***  
-                        Bitte werfen Sie zuerst einen Blick auf unsere SL-Hilfeseiten. Drücken Sie dazu F1. Oder rufen Sie unter http://secondlife.com/knowledgebase/ die Knowledge Base auf. 
-                        Falls Sie die gesuchte Antwort dort nicht finden, geben Sie Ihre Frage ein. Warten Sie dann einen Moment, bis ein verfügbarer Helfer antwortet.
-                        -=-=- Die Antwortzeiten variieren. Insbesondere zur Hauptbetriebszeit kann die Antwort etwas länger dauern. -=-=-
-                        </text>
-                        <text name="title_string">
-                                Instant Message an [NAME]
-                        </text>
-                        <text name="typing_start_string">
-                                [NAME] tippt...
-                        </text>
-                        <text name="session_start_string">
-                                Beginne Sitzung mit [NAME], bitte warten.
-                        </text>
-                </layout_panel>
-                <layout_panel name="active_speakers_panel">
-                        <scroll_list name="speakers_list">
-                                <column label="Name" name="speaker_name"/>
-                        </scroll_list>
-                        <panel name="volume_container">
-                                <text name="resident_name">
-                                        Rumpelstilzchen Megakrass
-                                </text>
-                                <text name="Mute:">
-                                        Stummschalten:
-                                </text>
-                                <check_box label="Text" name="mute_text_btn"/>
-                                <check_box label="Sprache" name="mute_btn"/>
-                        </panel>
-                </layout_panel>
-        </layout_stack>
        <string name="ringing">
                Voice-Chat wird beigetreten...
        </string>
@@ -76,4 +36,33 @@
        <string name="muted_text_label">
                Ihr Text-Chat wurde von einem Gruppenmoderator deaktiviert.
        </string>
+        <layout_stack name="panels">
+                <layout_panel name="im_contents_panel">
+                        <flyout_button label="Gruppeninfo" name="group_info_btn" width="85"/>
+        <flyout_button_item name="history_entry">
+          Verlauf anzeigen
+        </flyout_button_item>
+      </flyout_button>
+                        <button label="Gespräch beitreten" left_delta="90" name="start_call_btn" width="145"/>
+                        <button halign="center" label="Anruf beenden" name="end_call_btn" width="145"/>
+                        <button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Klicken Sie hier, um eine Liste der aktiven Teilnehmer dieser IM-Sitzung anzuzeigen."/>
+                        <line_editor label="Für Instant Message hier klicken" name="chat_editor"/>
+                        <button label="Senden" name="send_btn"/>
+                </layout_panel>
+                <layout_panel name="active_speakers_panel">
+                        <scroll_list name="speakers_list">
+                                <column label="Name" name="speaker_name"/>
+                        </scroll_list>
+                        <panel name="volume_container">
+                                <text name="resident_name">
+                                        Rumpelstilzchen Megakrass
+                                </text>
+                                <text name="Mute:">
+                                        Stummschalten:
+                                </text>
+                                <check_box label="Text" name="mute_text_btn"/>
+                                <check_box label="Sprache" name="mute_btn"/>
+                        </panel>
+                </layout_panel>
+        </layout_stack>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_inventory.xml b/linden/indra/newview/skins/default/xui/de/floater_inventory.xml
index c8c6724..50d6f13 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_inventory.xml
@@ -1,10 +1,52 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Inventory" title="Inventar">
-        <search_editor label="Suchanfrage hier eintippen" name="inventory search editor" />
+        <search_editor label="Suchanfrage hier eingeben" name="inventory search editor" />
+        <text name="group_titles_textbox">
+                Schnellfilter:
+        </text>
+        <!-- Inventory Type Filter Labels -->
+        <string name="filter_type_all">Alle Arten</string>
+        <string name="filter_type_animation">Animationen</string>
+        <string name="filter_type_bodypart">Körperteile</string>
+        <string name="filter_type_callingcard">Visitenkarten</string>
+        <string name="filter_type_clothing">Kleidung</string>
+        <string name="filter_type_gesture">Gesten</string>
+        <string name="filter_type_landmark">Landmarken</string>
+        <string name="filter_type_notecard">Notizkarten</string>
+        <string name="filter_type_object">Objekte</string>
+        <string name="filter_type_script">Skripte</string>
+        <string name="filter_type_sound">Klänge</string>
+        <string name="filter_type_texture">Texturen</string>
+        <string name="filter_type_snapshot">Fotos</string>
+        <string name="filter_type_custom">Anpassen...</string>
+        <combo_box name="Quick Filter" label="Schnellfilter">
+                <combo_item name="filter_type_all">Alle Arten</combo_item>
+                <separator />
+                <combo_item name="filter_type_animation">Animationen</combo_item>
+                <combo_item name="filter_type_bodypart">Körperteile</combo_item>
+                <combo_item name="filter_type_callingcard">Visitenkarten</combo_item>
+                <combo_item name="filter_type_clothing">Kleidung</combo_item>
+                <combo_item name="filter_type_gesture">Gesten</combo_item>
+                <combo_item name="filter_type_landmark">Landmarken</combo_item>
+                <combo_item name="filter_type_notecard">Notizkarten</combo_item>
+                <combo_item name="filter_type_object">Objekte</combo_item>
+                <combo_item name="filter_type_script">Skripte</combo_item>
+                <combo_item name="filter_type_sound">Klänge</combo_item>
+                <combo_item name="filter_type_texture">Texturen</combo_item>
+                <combo_item name="filter_type_snapshot">Fotos</combo_item>
+                <separator />
+                <combo_item name="filter_type_custom">Anpassen...</combo_item>
+        </combo_box>
        <tab_container name="inventory filter tabs">
-                <inventory_panel label="Alle Objekte" name="All Items" />
+                <inventory_panel label="Alle Artikel" name="All Items" />
-                <inventory_panel label="Letzte Objekte" name="Recent Items" />
+                <inventory_panel label="Letzte Artikel" name="Recent Items" />
+                <inventory_panel label="Getragene Artikel" name="Worn Items" />
        </tab_container>
        <menu_bar name="Inventory Menu">
                <menu label="Datei" name="File">
                        <menu_item_call label="Öffnen" name="Open" />
@@ -12,14 +54,14 @@
                        <menu_item_call label="Filter anzeigen" name="Show Filters" />
                        <menu_item_call label="Filter zurücksetzen" name="Reset Current" />
                        <menu_item_call label="Alle Ordner schließen" name="Close All Folders" />
-                        <menu_item_call label="Papierkorb ausleeren" name="Empty Trash" />
+                        <menu_item_call label="Papierkorb leeren" name="Empty Trash" />
                </menu>
                <menu label="Erstellen" name="Create">
                        <menu_item_call label="Neuer Ordner" name="New Folder" />
                        <menu_item_call label="Neues Skript" name="New Script" />
                        <menu_item_call label="Neue Notiz" name="New Note" />
                        <menu_item_call label="Neue Geste" name="New Gesture" />
-                        <menu name="New Clothes">
+                        <menu label="Neue Kleidung" name="New Clothes">
                                <menu_item_call label="Neues Hemd" name="New Shirt" />
                                <menu_item_call label="Neue Hose" name="New Pants" />
                                <menu_item_call label="Neue Schuhe" name="New Shoes" />
@@ -29,8 +71,10 @@
                                <menu_item_call label="Neue Handschuhe" name="New Gloves" />
                                <menu_item_call label="Neues Unterhemd" name="New Undershirt" />
                                <menu_item_call label="Neue Unterhose" name="New Underpants" />
+                                <menu_item_call label="Neue Tätowierung" name="New Tattoo" />
+                                <menu_item_call label="Neue Transparenz" name="New Alpha" />
                        </menu>
-                        <menu name="New Body Parts">
+                        <menu label="Neues Körperteil" name="New Body Parts">
                                <menu_item_call label="Neue Form/Gestalt" name="New Shape" />
                                <menu_item_call label="Neue Haut" name="New Skin" />
                                <menu_item_call label="Neues Haar" name="New Hair" />
@@ -43,5 +87,12 @@
                        <menu_item_check label="Ordner immer nach Name" name="Folders Always By Name" />
                        <menu_item_check label="Systemordner nach oben" name="System Folders To Top" />
                </menu>
+    <menu label="Suchen" name="Search">
+      <menu_item_check label="Nach Name" name="By Name" />
+      <menu_item_check label="Nach Ersteller" name="By Creator" />
+      <menu_item_check label="Nach Beschreibung" name="By Description" />
+      <menu_item_check label="Nach Allem" name="By All" />
+     </menu>
        </menu_bar>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml b/linden/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
index 0028f1d..7219ce6 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
@@ -56,7 +56,7 @@
        <check_box label="Kopieren" name="CheckNextOwnerCopy" left_delta="85" />
        <check_box label="Verkaufen/Weggeben" name="CheckNextOwnerTransfer" />
        <text name="SaleLabel">
-                Objekt markieren:
+                Artikel markieren:
        </text>
        <check_box label="Zum Verkauf" name="CheckPurchase" />
        <radio_group name="RadioSaleType" left_delta="85"  width="245" >
@@ -64,11 +64,11 @@
                        Original
                </radio_item>
                <radio_item name="radio2">
-                        Kopieren
+                        Kopie
                </radio_item>
        </radio_group>
        <text name="TextPrice">
-                Preis:  L$
+                Preis: [CURRENCY]
        </text>
        <text name="unknown">
                (unbekannt)
diff --git a/linden/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml b/linden/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
index aa24231..6ec5a08 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Inventory Finder" title="inventar_letzte_objekte">
+<floater name="Inventory Finder" title="inventar_letzte_artikel">
        <check_box label="Animation" name="check_animation" />
+        <check_box label="Körperteile" name="check_bodypart" />
        <check_box label="Visitenkarten" name="check_calling_card" />
        <check_box label="Kleidung" name="check_clothing" />
        <check_box label="Gesten" name="check_gesture" />
        <check_box label="Landmarken" name="check_landmark" />
        <check_box label="Notizkarten" name="check_notecard" />
        <check_box label="Objekte" name="check_object" />
-        <check_box label="Skripts" name="check_script" />
+        <check_box label="Skripte" name="check_script" />
-        <check_box label="Sounds" name="check_sound" />
+        <check_box label="Klänge" name="check_sound" />
        <check_box label="Texturen" name="check_texture" />
        <check_box label="Fotos" name="check_snapshot" />
        <button label="Alle" label_selected="Alle" name="All" />
        <button label="Keine" label_selected="Keine" name="None" />
        <check_box label="Ordner immer anzeigen" name="check_show_empty" />
@@ -18,7 +20,9 @@
        <text type="string" length="1" name="- OR -">
                - ODER -
        </text>
        <spinner label="Stunden zuvor" label_width="80" name="spin_hours_ago" />
        <spinner label="Tage zuvor" name="spin_days_ago" />
        <button label="Schließen" label_selected="Schließen" name="Close" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_joystick.xml b/linden/indra/newview/skins/default/xui/de/floater_joystick.xml
index 407556b..cd1a465 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_joystick.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_joystick.xml
@@ -4,6 +4,8 @@
                Joystick aktivieren:
        </check_box>
        <text left="140" name="joystick_type" width="360"/>
+        <check_box name="auto_enable_joystick">Joystick Autom. aktivieren</check_box>
        <spinner label="X-Achse" name="JoystickAxis1"/>
        <spinner label="Y-Achse" name="JoystickAxis2"/>
        <spinner label="Z-Achse" name="JoystickAxis0"/>
@@ -14,9 +16,11 @@
        <check_box label="Direkt-Zoom" name="ZoomDirect"/>
        <check_box label="3D-Cursor" left="300" name="Cursor3D"/>
        <check_box label="Automatisch ausrichten" left="390" name="AutoLeveling"/>
        <text name="Control Modes:">
                Steuermodi:
        </text>
        <check_box name="JoystickAvatarEnabled">
                Avatar
        </check_box>
@@ -26,6 +30,7 @@
        <check_box name="JoystickFlycamEnabled">
                Flycam
        </check_box>
        <text name="XScale">
                X-Skala
        </text>
@@ -71,6 +76,7 @@
        <text name="ZoomDeadZone">
                Zoom-Totzone
        </text>
        <button label="SpaceNavigator-Standards" name="SpaceNavigatorDefaults"/>
        <button label="OK" label_selected="OK" name="ok_btn"/>
        <button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn"/>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_lagmeter.xml b/linden/indra/newview/skins/default/xui/de/floater_lagmeter.xml
index 4dd9fd6..f49fcca 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_lagmeter.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_lagmeter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_lagmeter" title="Lag-Anzeige">
-        <button name="client_lagmeter" tool_tip="Client-Lag-Status" />
+        <button name="client_lagmeter" tool_tip="Lag-Status Client" />
        <text name="client">
                Client:
        </text>
@@ -14,7 +14,7 @@
        <text name="network_text">
                Normal
        </text>
-        <button name="server_lagmeter" tool_tip="Server-Lag-Status" />
+        <button name="server_lagmeter" tool_tip="Lag-Status Server" />
        <text name="server">
                Server:
        </text>
@@ -27,7 +27,7 @@
                Lag-Anzeige
        </text>
        <text name="max_width_px">
-                350
+                360
        </text>
        <text name="min_title_msg">
                Lag
@@ -48,10 +48,10 @@
                Normal, Fenster im Hintergrund
        </text>
        <text name="client_frame_time_critical_msg">
-                Client-Frame-Rate unter [CLIENT_FRAME_RATE_CRITICAL]
+                Frame-Rate Client unter [CLIENT_FRAME_RATE_CRITICAL]
        </text>
        <text name="client_frame_time_warning_msg">
-                Client-Frame-Rate zwischen [CLIENT_FRAME_RATE_CRITICAL] und [CLIENT_FRAME_RATE_WARNING]
+                Frame-Rate Client zwischen [CLIENT_FRAME_RATE_CRITICAL] und [CLIENT_FRAME_RATE_WARNING]
        </text>
        <text name="client_frame_time_normal_msg">
                Normal
@@ -117,10 +117,10 @@
                20
        </text>
        <text name="server_frame_time_critical_msg">
-                Simulator-Frame-Rate liegt unter [SERVER_FRAME_RATE_CRITICAL]
+                Frame-Rate Simulator liegt unter [SERVER_FRAME_RATE_CRITICAL]
        </text>
        <text name="server_frame_time_warning_msg">
-                Simulator-Frame-Rate liegt zwischen [SERVER_FRAME_RATE_CRITICAL] und [SERVER_FRAME_RATE_WARNING]
+                Frame-Rate Simulator liegt zwischen [SERVER_FRAME_RATE_CRITICAL] und [SERVER_FRAME_RATE_WARNING]
        </text>
        <text name="server_frame_time_normal_msg">
                Normal
diff --git a/linden/indra/newview/skins/default/xui/de/floater_local_asset_browse.xml b/linden/indra/newview/skins/default/xui/de/floater_local_asset_browse.xml
new file mode 100644
index 0000000..45a19ba
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/de/floater_local_asset_browse.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Local Asset Browser: xui -->
+<!-- floater definition start -->
+<floater
+        name="local_bitmap_browser_floater"
+        title="Lokal Textur-Eigenschaften"
+        >
+  <button
+    name="add_btn"
+    label="Hinzufügen"
+                />
+  <button
+                name="del_btn"
+                label="Entfernen"
+                />
+  <button
+    name="upload_btn"
+    label="Bild hochladen ([UPLOADFEE])..."
+                />
+  
+  <scroll_list
+    name="bitmap_list"
+                >
+    <column name="bitmap_name" label="Name" dynamicwidth="true" />
+    <column name="bitmap_uuid" label="UUID" width="240" />
+  </scroll_list>
+  
+  <text name="path_caption_text"
+          >
+    Lokaler Pfad:
+  </text>
+  <text name="uuid_caption_text"
+          >
+    Lokale UUID:
+  </text>
+  <texture_picker
+    label="Textur"
+    name="texture_view"
+    />
+  <check_box
+    label="Aktualisierungscheck"
+    name="keep_updating_checkbox"
+    tool_tip="Periodische Checks ein- oder ausschalten, ob die Quelle auf der Festplatte aktualisiert wurde"
+    />
+  <combo_box
+    name="type_combobox"
+    >
+    <combo_item name="type_texture" value="type_texture">
+      Textur
+    </combo_item>
+    <combo_item name="type_sculptie" value="type_sculptie">
+      Sculptmap
+    </combo_item>
+    <combo_item name="type_layer" value="type_layer">
+      Kleidung
+    </combo_item>
+  </combo_box>
+  <text name="time_caption_text"
+          >
+    Zeit:
+  </text>
+  <text name="time_text"
+    >
+    (Hier Datum)
+  </text>
+  <text name="link_caption_text"
+          >
+    Link:
+  </text>
+  <text name="link_text"
+    >
+    (Linkstatus)
+  </text>
+  <text name="name_caption_text"
+        >
+    Name:
+  </text>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/de/floater_media_browser.xml
index ee25321..3bc231a 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_media_browser.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_media_browser.xml
@@ -6,13 +6,17 @@
                        <button label="Weiter" name="forward" />
                        <button label="Neu laden" name="reload" />
                        <button label="Los" name="go" />
+                        <button label="Zuhause" name="home" />
                </layout_panel>
                <layout_panel name="parcel_owner_controls">
+                        <web_browser name="browser" />
                        <button label="Aktuelle URL an Parzelle senden" name="assign" />
                </layout_panel>
                <layout_panel name="external_controls">
                        <button label="In meinem Browser öffnen" name="open_browser" />
                        <check_box label="Immer in meinem Browser öffnen" name="open_always" />
+                        <button label="Als Zuhause setzen" name="set_home" />
                        <button label="Schließen" name="close" />
                </layout_panel>
        </layout_stack>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_mini_map.xml b/linden/indra/newview/skins/default/xui/de/floater_mini_map.xml
index d389258..232ec3e 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_mini_map.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="minimap">
+<floater name="minimap" short_title="Mini-Karte">
        <panel label="Minikarte" name="mini_mapview" tool_tip="(Karte mit Doppelklick öffnen)"/>
+  <!-- Note: panel contents are defined in panel_radar.xml -->
+  <panel name="RadarPanel" label="Radar" />
+  <button name="toggle_radar" label="" tool_tip="Radar anzeigen oder verstecken" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_mute.xml b/linden/indra/newview/skins/default/xui/de/floater_mute.xml
index 5dbb9fc..b39c97a 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_mute.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_mute.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="mute floater" title="Stummgeschaltete Einwohner und Objekte" short_title="Stummschalten-Liste">
+<floater name="mute floater" title="Stummgeschaltete Einwohner &amp; Objekte" short_title="Stummschalten-Liste">
-        <scroll_list name="mutes" tool_tip="List of currently muted residents" />
+        <scroll_list name="mutes" tool_tip="Liste derzeit stummgeschalteter Einwohner" />
        <button label="Einwohner stummschalten..." label_selected="Einwohner stummschalten..."
             name="Mute resident..."
             tool_tip="Wählen Sie einen Einwohner, um ihn stumm zu schalten" />
diff --git a/linden/indra/newview/skins/default/xui/de/floater_mute_object.xml b/linden/indra/newview/skins/default/xui/de/floater_mute_object.xml
index 60c6ff0..bf6059f 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_mute_object.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_mute_object.xml
@@ -2,7 +2,7 @@
 <floater name="mute by name" title="Objekt nach Name stummschalten">
        <text name="message">
                Stummschalten nach Name betrifft nur Chat und IM, keine
-Sounds. Sie müssen den Objektnamen exakt angeben.
+Klänge. Sie müssen den Objektnamen exakt eingeben.
        </text>
        <line_editor name="object_name">
                Objektname
diff --git a/linden/indra/newview/skins/default/xui/de/floater_name_description.xml b/linden/indra/newview/skins/default/xui/de/floater_name_description.xml
index f45b1e0..608c3eb 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_name_description.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_name_description.xml
@@ -7,5 +7,5 @@
                Beschreibung:
        </text>
        <button label="Abbrechen" name="cancel_btn" width="80" />
-        <button label="Hochladen ([AMOUNT] L$)" name="ok_btn" width="120" />
+        <button label="Hochladen ([UPLOADFEE])" name="ok_btn" width="120" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_new_outfit_dialog.xml b/linden/indra/newview/skins/default/xui/de/floater_new_outfit_dialog.xml
index 73c6760..dbb96ef 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_new_outfit_dialog.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_new_outfit_dialog.xml
@@ -16,6 +16,9 @@
        <check_box label="Unterhemd" name="checkbox_Undershirt" left="90"/>
        <check_box label="Unterhose" name="checkbox_Underpants" left="90"/>
        <check_box label="Rock" name="checkbox_Skirt" left="90"/>
+        <check_box label="Tätowierung" name="checkbox_Tattoo" left="90"/>
+        <check_box label="Transparenz" name="checkbox_Alpha" left="90"/>
        <check_box label="Brust" name="checkbox_Chest" left="190"/>
        <check_box label="Schädel" name="checkbox_Skull" left="190"/>
        <check_box label="Linke Schulter" name="checkbox_Left Shoulder" left="190"/>
@@ -59,9 +62,8 @@
        </text>
        <text type="string" length="1"
             name="Outfits are folders that contain clothing and body parts. Drag an outfit folder onto your avatar to put it on.   &quot;Make New Outfit&quot; makes a new folder and saves copies of the items you are now wearing into it.">
-                Outfits sind Ordner, die Kleider und Körperteile enthalten.
+                 Outfits sind Ordner, die Kleidung und Körperteile enthalten. Ziehen Sie einen Outfit-Ordner auf Ihren Avatar, um ihn anzuziehen.
-Ziehen Sie einen Outfit-Ordner auf Ihren Avatar, um ihn anzuziehen.
- 
 „Neues Outfit“ erstellt einen neuen Ordner und speichert darin Kopien der
 Objekte, die Sie gerade tragen.
        </text>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_notifications_console.xml b/linden/indra/newview/skins/default/xui/de/floater_notifications_console.xml
index a1cd698..14318dd 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_notifications_console.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_notifications_console.xml
@@ -2,4 +2,7 @@
 <floater name="notifications_console" title="Konsole: Meldungen">
        <combo_box label="Meldungsart auswählen" name="notification_types" width="412" />
        <button label="Hinzufügen" name="add_notification" left="417" width="78" />
+  <button name="reload_notifications" left="497" width="85" label="Alle Neuladen"/>
+  <layout_stack name="notification_channels">
+  </layout_stack>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_pay.xml b/linden/indra/newview/skins/default/xui/de/floater_pay.xml
index dc38697..a98894d 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_pay.xml
@@ -5,10 +5,10 @@
                Schnellzahlung:
        </text>
-        <button name="fastpay 1"  label="1 L$"  left="115" />
+        <button name="fastpay 1"  label="1 [CURRENCY]"  left="115" />
-        <button name="fastpay 5"  label="5 L$"             />
+        <button name="fastpay 5"  label="5 [CURRENCY]"             />
-        <button name="fastpay 10" label="10 L$" left="115" />
+        <button name="fastpay 10" label="10 [CURRENCY]" left="115" />
-        <button name="fastpay 20" label="20 L$"            />
+        <button name="fastpay 20" label="20 [CURRENCY]"            />
        <text name="amount text">
                Betrag:
diff --git a/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml
index 55ad735..fc7c204 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money">
+<floater name="Give Money" title="[PAY TYPE] [FIRST] [LAST]">
        <string name="pay group">
                Gruppe bezahlen:
@@ -16,14 +16,17 @@
                Schnellzahlung:
        </text>
-        <button name="fastpay 1"  label="1 L$"  left="115" />
+        <button name="fastpay 1"  label="1 [CURRENCY]"  left="115" />
-        <button name="fastpay 5"  label="5 L$"             />
+        <button name="fastpay 5"  label="5 [CURRENCY]"             />
-        <button name="fastpay 10" label="10 L$" left="115" />
+        <button name="fastpay 10" label="10 [CURRENCY]" left="115" />
-        <button name="fastpay 20" label="20 L$"            />
+        <button name="fastpay 20" label="20 [CURRENCY]"            />
        <text name="amount text">
                Betrag:
        </text>
+        <text name="currency text">
+                [CURRENCY]
+        </text>
        <button name="pay btn"    label="Zahlen"    />
        <button name="cancel btn" label="Abbrechen" />
diff --git a/linden/indra/newview/skins/default/xui/de/floater_post_process.xml b/linden/indra/newview/skins/default/xui/de/floater_post_process.xml
index e10806d..4baad69 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_post_process.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_post_process.xml
@@ -32,16 +32,16 @@
                                Rauschen-Stärke
                        </text>
                </panel>
-                <panel label="Bloom" name="wmiBloomPanel">
+                <panel label="Schleier" name="wmiBloomPanel">
                        <check_box label="Ein" name="wmiBloomToggle" />
                        <text name="wmiBloomExtractText">
                                Luminanz-Extraktion
                        </text>
                        <text name="wmiBloomSizeText">
-                                Bloom-Größe
+                                Schleier-Größe
                        </text>
                        <text name="wmiBloomStrengthText">
-                                Bloom-Stärke
+                                Schleier-Stärke
                        </text>
                </panel>
                <panel label="Extras" name="Extras">
diff --git a/linden/indra/newview/skins/default/xui/de/floater_postcard.xml b/linden/indra/newview/skins/default/xui/de/floater_postcard.xml
index 639a8ff..90a3c3d 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_postcard.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_postcard.xml
@@ -22,18 +22,11 @@
        <text_editor name="msg_form">
                Nachricht hier eingeben.
        </text_editor>
-        <check_box label="Im Web veröffentlichen" name="allow_publish_check"
-             tool_tip="Veröffentlicht diese Postkarte im Web." />
-        <check_box label="Ab-18-Inhalt" name="mature_check"
-             tool_tip="Diese Postkarte enthält nicht jugendfreie Inhalte." />
-        <button label="?" name="publish_help_btn" />
-        <text name="fine_print">
-                Wenn sich der Empfänger bei SL anmeldet, erhalten Sie einen Empfehlungsbonus.
-        </text>
        <button label="Abbrechen" name="cancel_btn" />
        <button label="Senden" name="send_btn" />
        <text name="default_subject">
-                Postkarte aus Second Life.
+                Postkarte aus [GRID_NAME].
        </text>
        <text name="default_message">
                Sehen Sie hier!
diff --git a/linden/indra/newview/skins/default/xui/de/floater_preferences.xml b/linden/indra/newview/skins/default/xui/de/floater_preferences.xml
index 5f68282..ac18f28 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_preferences.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_preferences.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Preferences" title="Einstellungen">
+<floater name="Preferences" title="Voreinstellungen">
        <button label="OK" label_selected="OK" name="OK" />
        <button label="Abbrechen" label_selected="Abbrechen" name="Cancel" />
        <button label="Übernehmen" label_selected="Übernehmen" name="Apply" />
-        <button label="Info" label_selected="Info" name="About..." />
        <button label="Hilfe" label_selected="Hilfe" name="Help" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_preview_notecard.xml b/linden/indra/newview/skins/default/xui/de/floater_preview_notecard.xml
index 370f242..7925ed6 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_preview_notecard.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_preview_notecard.xml
@@ -1,16 +1,40 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="preview notecard" title="Hinweis:">
-        <button label="Speichern" label_selected="Speichern" name="Save" />
        <text type="string" length="1" name="desc txt">
                Beschreibung:
        </text>
+        <menu_bar name="motecard_menu">
+    <menu name="File">
+      <menu_item_call label="Speichern" name="Save Menu" shortcut="control|S" />
+      <menu_item_separator />
+      <menu_item_call label="Text Exportieren..." name="Export Text..." />
+      <menu_item_call label="Text Importieren..." name="Import Text..." />
+    </menu>
+                <menu name="Edit">
+                        <menu_item_call label="Rückgängig" name="Undo" />
+                        <menu_item_call label="Wiederherstellen" name="Redo" width="139" />
+                        <menu_item_separator label="-----------" name="separator1" width="139" />
+                        <menu_item_call label="Ausschneiden" name="Cut" />
+                        <menu_item_call label="Kopieren" name="Copy" />
+                        <menu_item_call label="Einfügen" name="Paste" />
+                        <menu_item_separator label="-----------" name="separator2" width="139" />
+                        <menu_item_call label="Alle auswählen" name="Select All" width="139" />
+                        <menu_item_call label="Deselektieren" name="Deselect" width="139" />
+                        <menu_item_separator label="-----------" name="separator3" width="139" />
+                        <menu_item_call label="Suchen / Ersetzen..."
+                             name="Search / Replace..." width="139" />
+                </menu>
+        </menu_bar>
        <text_editor type="string" length="1" name="Notecard Editor">
                Wird geladen...
        </text_editor>
-        <text name="no_object">
+        <button label="Sichern" label_selected="Sichern" name="Save" />
+        <string name="no_object">
                Es wurde kein Objekt gefunden, das diese Notiz enthält.
-        </text>
+        </string>
-        <text name="not_allowed">
+        <string name="not_allowed">
                Sie können diese Notiz nicht anzeigen.
-        </text>
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_preview_notecard_keep_discard.xml b/linden/indra/newview/skins/default/xui/de/floater_preview_notecard_keep_discard.xml
index 1faf82b..7d068fe 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_preview_notecard_keep_discard.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_preview_notecard_keep_discard.xml
@@ -1,16 +1,39 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview_notecard">
+<floater name="preview_notecard" title="Notiz:" >
-        <text_editor type="string" length="1" name="Notecard Editor">
-                Wird geladen...
-        </text_editor>
        <text type="string" length="1" name="desc txt">
                Beschreibung:
        </text>
+        <menu_bar name="motecard_menu">
+    <menu name="File">
+      <menu_item_call label="Sichern" name="Save Menu" />
+      <menu_item_separator />
+      <menu_item_call label="Text Exportieren..." name="Export Text..." />
+      <menu_item_call label="Text Importieren..." name="Import Text..." />
+    </menu>
+                <menu name="Edit">
+                        <menu_item_call label="Rückgängig" name="Undo" width="139" />
+                        <menu_item_call label="Wiederherstellen" name="Redo" width="139" />
+                        <menu_item_separator label="-----------" name="separator1" width="139" />
+                        <menu_item_call label="Ausschneiden" name="Cut" width="139" />
+                        <menu_item_call label="Kopieren" name="Copy" width="139" />
+                        <menu_item_call label="Einfügen" name="Paste" width="139" />
+                        <menu_item_separator label="-----------" name="separator2" width="139" />
+                        <menu_item_call label="Alle auswählen" name="Select All" width="139" />
+                        <menu_item_call label="Deselektieren" name="Deselect" width="139" />
+                        <menu_item_separator label="-----------" name="separator3" width="139" />
+                        <menu_item_call label="Suchen / Ersetzen..."
+                             name="Search / Replace..." width="139" />
+                </menu>
+        </menu_bar>
+        <text_editor type="string" length="1" name="Notecard Editor">
+                Wird geladen...
+        </text_editor>
        <button label="Behalten" label_selected="Behalten" name="Keep" />
+        <button label="Sichern" label_selected="Sichern" name="Save" />
        <button label="Verwerfen" label_selected="Verwerfen" name="Discard" />
-        <text name="no_object">
+        <string name="no_object">
-                Es wurde kein Objekt gefunden, das diese Notiz enthält:
+                Es wurde kein Objekt gefunden, das diese Notiz enthält.
-        </text>
+        </string>
        <string name="not_allowed">
                Sie können diese Notiz nicht anzeigen.
        </string>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_preview_sound.xml b/linden/indra/newview/skins/default/xui/de/floater_preview_sound.xml
index fd0a824..64e3e56 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_preview_sound.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_preview_sound.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview_sound">
+<floater name="preview_sound" width="310">
        <text type="string" length="1" name="desc txt">
                Beschreibung:
        </text>
@@ -8,5 +8,5 @@
             tool_tip="Gibt diesen Sound so wieder, dass andere ihn hören können." />
        <button label="Lokal wiedergeben" label_selected="Lokal wiedergeben"
             name="Sound audition btn"
-             tool_tip="Gibt diesen Sound so wieder, dass nur Sie ihn hören." />
+             tool_tip="Gibt diesen Sound so wieder, dass nur Sie ihn hören." width="130" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_prim_import.xml b/linden/indra/newview/skins/default/xui/de/floater_prim_import.xml
new file mode 100644
index 0000000..0e5c6b1
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/de/floater_prim_import.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Import" title="Fortschritt des Imports">
+  <text name="name_label"> Fortschritt </text>  
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_report_abuse.xml b/linden/indra/newview/skins/default/xui/de/floater_report_abuse.xml
index 6a7246d..048066e 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_report_abuse.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_report_abuse.xml
@@ -119,6 +119,7 @@ dann auf das Objekt:
                <combo_item name="Indecency__Broadly_offensive_content_or_conduct">
                        Unanständigkeit &gt; Anstößige Inhalte oder Handlungen in der Öffentlichkeit
                </combo_item>
+<!--  58 = deprecated by AO -->
                <combo_item name="Indecency__Inappropriate_avatar_name">
                        Unanständigkeit &gt; Anstößiger Avatarname
                </combo_item>
@@ -138,7 +139,7 @@ dann auf das Objekt:
                        Intoleranz
                </combo_item>
                <combo_item name="Land__Abuse_of_sandbox_resources">
-                        Land &gt; Missbrauch der Sandbox-Ressourcen
+                        Land &gt; Missbrauch von Sandbox-Ressourcen
                </combo_item>
                <combo_item name="Land__Encroachment__Objects_textures">
                        Land &gt; Unbefugte Nutzung &gt; Objekte/Texturen
@@ -160,7 +161,7 @@ dann auf das Objekt:
                Name des Beschuldigten:
        </text>
        <button label="Einwohner auswählen" label_selected="" name="select_abuser" tool_tip="Den Namen des Beschuldigten aus einer Liste wählen"/>
-        <check_box label="Name des Täters ist nicht bekannt" name="omit_abuser_name" tool_tip="Wählen Sie diese Option, wenn Ihnen der Name des Täters unbekannt ist"/>
+        <check_box label="Name des Täters unbekannt" name="omit_abuser_name" tool_tip="Wählen Sie diese Option, wenn Ihnen der Name des Täters nicht bekannt ist"/>
        <text name="abuser_name_title2">
                Ort des Missbrauchs:
        </text>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/de/floater_report_bug.xml
index 2c8734e..fdcde20 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_report_bug.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="bug_reporter" title="Fehler melden">
+        <texture_picker label="" name="screenshot"/>
+        <check_box bottom_delta="-20" label="Screenshot einschließen" name="screen_check"/>
        <text name="reporter_title">
                Melder:
        </text>
@@ -24,13 +26,11 @@ dann auf das Objekt:
        <text name="owner_name_label">
                Eigentümer:
        </text>
-        <check_box label="Screenshot einschließen" name="screen_check" />
-        <texture_picker label="Arbeitet..." name="screenshot" />
        <text name="owner_name">
                Hendrerit Vulputate
        </text>
        <combo_box name="category_combo"
-             tool_tip="Category -- select the category that best describes this report">
+             tool_tip="Kategorie -- wählen Sie die Kategorie aus, die am besten auf diesen Bericht zutrifft">
                <combo_item name="Selectcategory">
                        Kategorie auswählen
                </combo_item>
@@ -74,7 +74,7 @@ dann auf das Objekt:
                        Skript
                </combo_item>
                <combo_item name="Sound">
-                        Sound
+                        Klang
                </combo_item>
                <combo_item name="Stipends">
                        Stipendium
diff --git a/linden/indra/newview/skins/default/xui/de/floater_rlv_behaviour.xml b/linden/indra/newview/skins/default/xui/de/floater_rlv_behaviour.xml
new file mode 100644
index 0000000..a08d9b2
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/de/floater_rlv_behaviour.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="rlvBehaviours"
+     title="Active RLV-Beschränkungen">
+  <scroll_list name="behaviour_list">
+    <column label="Beschränkung" name="behaviour" />
+    <column label="Objektname" name="name" />
+  </scroll_list>
+</floater>
+\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/de/floater_telehub.xml b/linden/indra/newview/skins/default/xui/de/floater_telehub.xml
index 264411c..fef4fcd 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_telehub.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_telehub.xml
@@ -23,10 +23,10 @@
        <text name="spawn_point_help">
                Wählen Sie ein Objekt und klicken zur
 Positionsangabe auf „Hinzufügen“. Anschließend
-können sie das Objekt verschieben oder löschen.
+können Sie das Objekt verschieben oder löschen.
 Positionsangaben sind relativ zum
 Telehub-Mittelpunkt.
-Wählen Sie ein Objekt aus, um seine Position in
+Wählen Sie ein Objekt der Liste aus, um seine 
-der Welt anzuzeigen.
+Position in der Welt anzuzeigen.
        </text>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_teleport_history.xml b/linden/indra/newview/skins/default/xui/de/floater_teleport_history.xml
new file mode 100644
index 0000000..7980f1e
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/de/floater_teleport_history.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="teleporthistory" title="Teleportier-Historie">
+        <tab_container label="TP-Listenregister" name="tplisttabs">
+                <panel label="Teleportiert nach" name="TP-in">
+        <scroll_list name="places_list_in">
+                <column label="Region" name="region" />
+                <column label="Position" name="position" />
+                <column label="Besucht" name="visited" />
+                <!--Hidden fields, used as storage for prebuilt strings, please keep at width 0-->
+                <column label="SLURL" name="slurl" />
+                <column label="Sim String" name="simstring" />
+        </scroll_list>
+                </panel>
+                <panel label="Teleportiert von" name="TP-out">
+                        <scroll_list name="places_list_out">
+                                <column label="Region" name="region" />
+                                <column label="Position" name="position" />
+                                <column label="Besucht" name="visited" />
+                                <!--Hidden fields, used as storage for prebuilt strings, please keep at width 0-->
+                                <column label="SLURL" name="slurl" />
+                                <column label="Sim String" name="simstring" />
+                        </scroll_list>
+                </panel>
+        </tab_container>
+        <button label="Teleportieren" label_selected="Teleportieren"
+                name="teleport" tool_tip="Teleportiert zum ausgewählten Ort" />
+        <button label="Auf Karte zeigen" label_selected="Auf Karte zeigen"
+                name="show_on_map"
+                tool_tip="Zentriert die Karte auf diesen Ort" />
+        <button label="Historie löschen"
+                name="clear_history"
+                tool_tip="Gesicherte Teleportier-Historie löschen" />
+        <button label="SLURL auf Zwischenablage kopieren" name="copy_slurl"
+                tool_tip="Kopiert den aktuellen Ort als SLURL, um ihn im Internet zu nutzen." />
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml b/linden/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
index 4aa7db4..efa21fd 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
@@ -9,16 +9,38 @@
        <text type="string" length="1" name="unknown">
                Maße: [DIMENSIONS]
        </text>
        <button label="Standard" label_selected="Standard" name="Default" />
        <button label="Keine" label_selected="Keine" name="None" />
        <button label="Leer" label_selected="Leer" name="Blank" />
+        <button label="Unsichtbar" label_selected="Unsichtbar" name="Invisible" />
        <check_box label="Ordner anzeigen" name="show_folders_check" />
-        <search_editor label="Suchanfrage hier eintippen" name="inventory search editor" />
        <check_box label="Sofort übernehmen" name="apply_immediate_check" />
        <button label="" label_selected="" name="Pipette" />
        <button label="Abbrechen" label_selected="Abbrechen" name="Cancel" />
        <button label="Auswählen" label_selected="Auswählen" name="Select" />
-        <text name="pick title">
+        <string name="pick title">
                Auswählen:
-        </text>
+        </string>
+        <tab_container name="actions_tab_container">
+    <panel label="Inventar" name="server_tab">
+        <search_editor label="Suchanfrage hier eintippen" name="inventory search editor" />
+        <inventory_panel name="inventory panel" />
+    </panel>
+    <panel label="Computer" name="local_tab">
+  <!-- tag: vaa emerald local_asset_browser [begin] -->
+      <text name="select_local">
+        Textur auf Ihrem Computer für Vorschau in-welt auswählen
+      </text>
+      <button label="Hinzufügen" name="Add" width="70" />
+      <button label="Entfernen" name="Remove" />
+      <button label="Eigenschaften..." name="Browser" />
+      <scroll_list name="local_name_list" >
+              <column name="unit_name" label="Name" />
+              <column name="unit_id_HIDDEN" label="ID" />
+        </scroll_list>
+        <!-- tag: vaa emerald local_asset_browser [end] -->
+    </panel>
+  </tab_container>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_tools.xml b/linden/indra/newview/skins/default/xui/de/floater_tools.xml
index 44ebde6..aa8170b 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_tools.xml
@@ -1,21 +1,38 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="toolbox floater" title="" short_title="Bauen">
+<floater name="toolbox floater" title="" short_title="Bauen" width="282">
+<!-- Main floater tabs -->
        <button label="" label_selected="" name="button focus" tool_tip="Fokus"/>
        <button label="" label_selected="" name="button move" tool_tip="Verschieben"/>
        <button label="" label_selected="" name="button edit" tool_tip="Bearbeiten"/>
        <button label="" label_selected="" name="button create" tool_tip="Erstellen"/>
        <button label="" label_selected="" name="button land" tool_tip="Land"/>
-        <check_box label="Zoom" name="radio zoom"/>
+<!-- Focus panel -->
+        <check_box label="Zoom:" name="radio zoom"/>
        <check_box label="Orbit (Strg)" name="radio orbit"/>
        <check_box label="Schwenken (Strg-Umschalt)" name="radio pan"/>
+<!-- Move panel -->
        <check_box label="Verschieben" name="radio move"/>
        <check_box label="Heben (Strg)" name="radio lift"/>
        <check_box label="Rotieren (Strg-Umschalt)" name="radio spin"/>
+<!-- Edit panel -->
        <check_box label="Position" name="radio position"/>
        <check_box label="Drehen (Strg)" name="radio rotate"/>
        <check_box label="Dehnen (Strg-Umschalt)" name="radio stretch"/>
        <check_box label="Textur auswählen" name="radio select face"/>
        <check_box label="Verknüpfte Teile bearbeiten" name="checkbox edit linked parts"/>
+        <button label="Verknüpfen" label_selected="Verknüpfen"
+          left="10" name="link_btn" width="68" />
+        <button label="Trennen" label_selected="Trennen"
+          name="unlink_btn" width="68" />
        <text name="text ruler mode">
                Lineal:
        </text>
@@ -33,10 +50,16 @@
        <check_box label="Beide Seiten dehnen" name="checkbox uniform"/>
        <check_box label="Texturen dehnen" name="checkbox stretch textures"/>
        <check_box label="Raster verwenden" name="checkbox snap to grid"/>
-        <button label="Optionen..." label_selected="Optionen..." name="Options..."/>
+        <button label="Bauoptionen..." label_selected="Bauoptionen..." name="Options..."/>
+<!-- Help text -->
        <text name="text status">
                Zum Verschieben ziehen, zum Kopieren Umschalttaste-Ziehen
        </text>
+<!-- Create panel -->
        <button label="" label_selected="" name="ToolCube" tool_tip="Würfel"/>
        <button label="" label_selected="" name="ToolPrism" tool_tip="Prisma"/>
        <button label="" label_selected="" name="ToolPyramid" tool_tip="Pyramide"/>
@@ -52,10 +75,15 @@
        <button label="" label_selected="" name="ToolRing" tool_tip="Ring"/>
        <button label="" label_selected="" name="ToolTree" tool_tip="Baum"/>
        <button label="" label_selected="" name="ToolGrass" tool_tip="Gras"/>
+        <text name="tree_grass_label" />
+        <combo_box name="trees_grass" />
        <check_box label="Auswahl behalten" name="checkbox sticky"/>
        <check_box label="Auswahl kopieren" name="checkbox copy selection"/>
        <check_box label="Zentrieren" name="checkbox copy centers"/>
        <check_box label="Drehen" name="checkbox copy rotates"/>
+<!-- Land panel -->
        <check_box label="Land auswählen" name="radio select land"/>
        <check_box label="Einebnen" name="radio flatten"/>
        <check_box label="Anheben" name="radio raise"/>
@@ -68,10 +96,10 @@
                Planierraupe:
        </text>
        <text name="Dozer Size:">
-                Größe
+                Größe:
        </text>
        <text name="Strength:">
-                Stärke
+                Stärke:
        </text>
        <text name="obj_count">
                Ausgewählte Objekte: [COUNT]
@@ -79,7 +107,13 @@
        <text name="prim_count">
                Primitive: [COUNT]
        </text>
-        <tab_container name="Object Info Tabs" tab_max_width="150" tab_min_width="30">
+        <text name="link_num">
+                Linknummer: [NUMBER]
+  </text>
+<!-- Sub-tabs -->
+        <tab_container name="Object Info Tabs" tab_max_width="150" tab_min_width="30" width="280">
                <panel label="Allgemein" name="General">
                        <text name="Name:">
                                Name:
@@ -91,16 +125,20 @@
                                Ersteller:
                        </text>
                        <text name="Creator Name">
-                                Thrax Linden
+                                Imprudent Linden
                        </text>
-                        <button label="Profil..." label_selected="Profil..." name="button creator profile"/>
                        <text name="Owner:">
                                Eigentümer:
                        </text>
                        <text name="Owner Name">
-                                Thrax Linden
+                                Imprudent Linden
-                        </text>
+                        </text>
-                        <button label="Profil..." label_selected="Profil..." name="button owner profile"/>
+                <text name="Last Owner:">
+                                Last Owner:
+                </text>
+                <text name="Last Owner Name">
+                                Imprudent Linden
+                </text>
                        <text name="Group:">
                                Gruppe:
                        </text>
@@ -116,30 +154,35 @@
                        </text>
                        <check_box label="Mit Gruppe teilen" left="6" name="checkbox share with group" tool_tip="Allen Mitgliedern der zugeordneten Gruppe die Erlaubnis erteilen, Ihre Berechtigungen für dieses Objekt zu teilen und zu verwenden. Sie müssen Übereignen, um Rollenbeschränkungen zu aktivieren."/>
                        <string name="text deed continued">
-                                Übertragung...
+                                Übereignung...
                        </string>
                        <string name="text deed">
-                                Übertragung
+                                Übereignung
                        </string>
-                        <button label="Übertragung..." label_selected="Übertragung..." name="button deed" tool_tip="In der Gruppe gemeinsam verwendete Objekte können von einem Gruppenfunktionär übertragen werden."/>
+                        <button label="Übereignung..." label_selected="Übereignung..." name="button deed" tool_tip="In der Gruppe gemeinsam verwendete Objekte können von einem Gruppenoffizier übereignet werden."/>
-                        <check_box label="Verschieben durch beliebige Personen zulassen" left="6" name="checkbox allow everyone move"/>
-                        <check_box label="Kopieren durch beliebige Personen zulassen" left="6" name="checkbox allow everyone copy"/>
                        <check_box label="In Suche anzeigen" left="6" name="search_check" tool_tip="Dieses Objekt in Suchergebnissen anzeigen"/>
-                        <check_box label="Zu verkaufen" left="6" name="checkbox for sale"/>
+                        <check_box label="Zu verkaufen:" left="6" name="checkbox for sale"/>
                        <text name="Cost">
-                                Preis:L$
+                                Preis: [CURRENCY]
                        </text>
                        <radio_group name="sale type">
                                <radio_item name="Original">
                                        Original
                                </radio_item>
                                <radio_item name="Copy">
-                                        Kopieren
+                                        Kopie
                                </radio_item>
                                <radio_item name="Contents">
                                        Inhalt
                                </radio_item>
                        </radio_group>
+                <button label="Schlüssel kopieren" label_selected="Schlüsselkopie" name="button copy key" width="78"
+             tool_tip="Den/die Schlüssel eines Objekts in die Zwischenablage kopieren" />
+                        <text name="Anyone can:">
+                                Jeder:
+                        </text>
+                        <check_box label="Bewegen" name="checkbox allow everyone move"/>
+                        <check_box label="Kopieren" name="checkbox allow everyone copy"/>
                        <text name="Next owner can:">
                                Nächster Eigentümer kann:
                        </text>
@@ -149,6 +192,8 @@
                        <text name="label click action">
                                Bei Linksklicken:
                        </text>
+                             <!-- Do not reorder these items, the index numbers are
+                                        used internally. JC -->
                        <combo_box name="clickaction" width="178">
                                <combo_item name="Touch/grab(default)">
                                        Berühren/Greifen (Standard)
@@ -206,13 +251,13 @@
                                Gesamtes Objekt muss gewählt werden, um Berechtigungen festzulegen.
                        </string>
                        <string name="Cost Default">
-                                Preis:L$
+                                Preis:      [CURRENCY]
                        </string>
                        <string name="Cost Total">
-                                Summe:L$
+                                Summe:  [CURRENCY]
                        </string>
                        <string name="Cost Per Unit">
-                                Stückpreis:L$
+                                Stückpreis:     [CURRENCY]
                        </string>
                        <string name="Cost Mixed">
                                Mischpreis
@@ -221,31 +266,43 @@
                                Mischverkauf
                        </string>
                </panel>
-                <panel label="Objekt" name="Object">
+<!-- Object sub-tab -->
+                <panel label="Objekt" name="Object" width="272">
                        <text name="select_single">
-                                Wählen Sie nur ein Primitivum aus, um Parameter zu bearbeiten.
+                                Nur einzelne Primitiva bearbeiten.
                        </text>
                        <text name="edit_object">
                                Objektparameter bearbeiten:
                        </text>
-                        <check_box label="Gesperrt" name="checkbox locked" tool_tip="Verhindert, dass Objekt verschoben oder gelöscht wird. Oft beim Bauen nützlich, um unbeabsichtigte Bearbeitungen zu vermeiden."/>
+                        <check_box label="Gesperrt" name="checkbox locked" tool_tip="Verhindert, dass das Objekt verschoben oder gelöscht wird. Oft beim Bauen nützlich, um unbeabsichtigte Bearbeitungen zu vermeiden."/>
-                        <check_box label="Physisch" name="Physical Checkbox Ctrl" tool_tip="Gestattet, das Objekt geschoben und von Schwerkraft beeinflusst wird"/>
+                        <check_box label="Physisch" name="Physical Checkbox Ctrl" tool_tip="Gestattet, dass das Objekt geschoben und von Schwerkraft beeinflusst wird"/>
-                        <check_box label="Temporär" name="Temporary Checkbox Ctrl" tool_tip="Verursacht, dass Objekt 1 Minute nach Erstellung gelöscht wird."/>
+                        <check_box label="Temporär" name="Temporary Checkbox Ctrl" tool_tip="Verursacht, dass das Objekt 1 Minute nach Erstellung gelöscht wird."/>
                        <check_box label="Phantom" name="Phantom Checkbox Ctrl" tool_tip="Verursacht, dass Objekt nicht mit anderen Objekten oder Avataren kollidiert"/>
                        <text name="label position">
-                                Position (Meter)
+                                Position (Meter):
                        </text>
                        <spinner label="X" name="Pos X"/>
                        <spinner label="Y" name="Pos Y"/>
                        <spinner label="Z" name="Pos Z"/>
+                <button label="C" name="copypos"        tool_tip="Position kopieren" />
+                <button label="P" name="pastepos"        tool_tip="Position einfügen" />
+                <button label="p" name="pasteposclip"        tool_tip="Position von Zwischenablage einfügen" />
                        <text name="label size">
-                                Größe (Meter)
+                                Größe (Meter):
                        </text>
                        <spinner label="X" name="Scale X"/>
                        <spinner label="Y" name="Scale Y"/>
                        <spinner label="Z" name="Scale Z"/>
+                <button label="C" name="copysize"        tool_tip="Größe kopieren" />
+                <button label="P" name="pastesize"        tool_tip="Größe einfügen" />
+                <button label="p" name="pastesizeclip"  tool_tip="Größe von Zwischenablage einfügen" />
                        <text name="label rotation">
-                                Rotation (Grad)
+                                Rotation (Grad):
                        </text>
                        <spinner label="X" name="Rot X"/>
                        <spinner label="Y" name="Rot Y"/>
@@ -253,6 +310,14 @@
                        <text name="label material">
                                Material
                        </text>
+                <button label="C" name="copyrot" 
+tool_tip="Rotation kopieren" />
+                <button label="P" name="pasterot"       tool_tip="Rotation einfügen" />
+                <button label="p" name="pasterotclip"        tool_tip="Rotation von Zwischenablage einfügen" />
+                <text name="label material">
+                                        Material:
+                </text>
                        <combo_box name="material">
                                <combo_item name="Stone">
                                        Stein
@@ -276,10 +341,11 @@
                                        Gummi
                                </combo_item>
                        </combo_box>
-                        <text left="115" name="label basetype">
+                        <button label="Bau-Mathe" label_selected="Bau-Mathe" tool_tip="mathem. Konstanten des Objekts" name="build_math_constants" />
+                        <text left="130" name="label basetype">
                                Bausteintyp
                        </text>
-                        <combo_box left="115" name="comboBaseType">
+                        <combo_box left="130" name="comboBaseType">
                                <combo_item name="Box">
                                        Quader
                                </combo_item>
@@ -305,23 +371,23 @@
                                        Geformt
                                </combo_item>
                        </combo_box>
-                        <text left="115" name="text cut" width="146">
+                        <text left="130" name="text cut" width="146">
-                                Pfadschnitt Beginn und Ende
+                                Pfadschnitt Beginn und Ende:
                        </text>
-                        <spinner label="B" left="115" name="cut begin"/>
+                        <spinner label="B" left="130" name="cut begin"/>
-                        <spinner label="E" left="115" name="cut end"/>
+                        <spinner label="E" left="130" name="cut end"/>
-                        <text left="115" name="text hollow">
+                        <text left="130" name="text hollow">
-                                Hohl
+                                Hohl:
                        </text>
-                        <text left="115" name="text skew">
+                        <text left="130" name="text skew">
-                                Versatz
+                                Versatz:
                        </text>
-                        <spinner left="115" name="Scale 1"/>
+                        <spinner left="130" name="Scale 1"/>
-                        <spinner left="115" name="Skew"/>
+                        <spinner left="130" name="Skew"/>
-                        <text left="115" name="Hollow Shape">
+                        <text left="130" name="Hollow Shape">
-                                Hohlform
+                                Hohlform:
                        </text>
-                        <combo_box left="115" name="hole">
+                        <combo_box left="130" name="hole">
                                <combo_item name="Default">
                                        Standard
                                </combo_item>
@@ -335,57 +401,59 @@
                                        Dreieck
                                </combo_item>
                        </combo_box>
-                        <text left="115" name="text twist">
+                        <text left="130" name="text twist">
-                                Torsion
+                                Torsion Beginn und Ende:
                        </text>
-                        <spinner label="B" left="115" name="Twist Begin"/>
+                        <spinner label="B" left="130" name="Twist Begin"/>
-                        <spinner label="E" left="115" name="Twist End"/>
+                        <spinner label="E" left="130" name="Twist End"/>
-                        <text left="115" name="scale_taper">
+                        <text left="130" name="scale_taper">
-                                Verjüngung
+                                Verjüngung:
                        </text>
-                        <text left="115" name="scale_hole">
+                        <text left="130" name="scale_hole">
-                                Lochgröße
+                                Lochgröße:
                        </text>
-                        <spinner label="X" left="115" name="Taper Scale X"/>
+                        <spinner label="X" left="130" name="Taper Scale X"/>
-                        <spinner label="Y" left="115" name="Taper Scale Y"/>
+                        <spinner label="Y" left="130" name="Taper Scale Y"/>
-                        <text left="115" name="text topshear">
+                        <text left="130" name="text topshear">
-                                Verscherung
+                                Verscherung:
                        </text>
-                        <spinner label="X" left="115" name="Shear X"/>
+                        <spinner label="X" left="130" name="Shear X"/>
-                        <spinner label="Y" left="115" name="Shear Y"/>
+                        <spinner label="Y" left="130" name="Shear Y"/>
-                        <text left="115" name="advanced_cut" width="153">
+                        <text left="130" name="advanced_cut" width="153">
-                                Profilschnitt-Beginn und Ende
+                                Profilschnitt-Beginn und Ende:
                        </text>
-                        <text left="115" name="advanced_dimple">
+                        <text left="130" name="advanced_dimple">
-                                Vertiefung-Beginn und Ende
+                                Vertiefung-Beginn und Ende:
                        </text>
-                        <text name="advanced_slice">
+                        <text left="130" name="advanced_slice">
-                                Anfang/Ende abschneiden
+                                Anfang/Ende abschneiden:
                        </text>
-                        <spinner label="B" left="115" name="Path Limit Begin"/>
+                        <spinner label="B" left="130" name="Path Limit Begin"/>
                        <spinner label="E" name="Path Limit End"/>
-                        <text left="115" name="text taper2">
+                        <text left="130" name="text taper2">
-                                Verjüngung
+                                Verjüngung:
                        </text>
-                        <spinner label="X" left="115" name="Taper X"/>
+                        <spinner label="X" left="130" name="Taper X"/>
                        <spinner label="Y" name="Taper Y"/>
-                        <text left="115" name="text radius delta">
+                        <text left="130" name="text radius delta">
-                                Radius
+                                Radius:
                        </text>
                        <text name="text revolutions" width="74">
-                                Umdrehungen
+                                Umdrehungen:
                        </text>
-                        <spinner left="115" name="Radius Offset"/>
+                        <spinner left="130" name="Radius Offset"/>
+                        <spinner name="Revolutions" />
                        <texture_picker label="Textur für gestaltetes 
-Primitiv" name="sculpt texture control" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
+Primitiv:" name="sculpt texture control" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
                        <check_box bottom_delta="-34" label="Spiegeln" name="sculpt mirror control" tool_tip="Geformtes Primitiv entlang der X-Achse spiegeln."/>
                        <check_box label="Wenden" name="sculpt invert control" tool_tip="Dreht die Normalen des geformten Primitivs von innen nach außen."/>
                        <text name="label sculpt type">
-                                Naht
+                                Naht:
                        </text>
                        <combo_box name="sculpt type control">
                                <combo_item name="None">
-                                        (keiner)
+                                        (keine)
                                </combo_item>
                                <combo_item name="Sphere">
                                        Kugel
@@ -401,31 +469,38 @@ Primitiv" name="sculpt texture control" tool_tip="Klicken Sie hier, um ein Bild
                                </combo_item>
                        </combo_box>
                </panel>
-                <panel label="Eigenschaften" name="Features">
+<!-- Features sub-tab -->
+                <panel label="Eigenschaften" name="Features" height="25" >
                        <text name="select_single">
-                                Wählen Sie nur einen einzelnen Baustein aus, um Eigenschaften zu bearbeiten.
+                                Wählen Sie nur einen einzelnen Baustein aus,
+um Eigenschaften zu bearbeiten.
                        </text>
-                        <text name="edit_object">
+                        <text name="edit_object" bottom_delta="-10" >
                                Objekteigenschaften bearbeiten:
                        </text>
                        <check_box label="Flexibler Weg" name="Flexible1D Checkbox Ctrl" tool_tip="Gestattet, dass Objekt um die Z-Achse gebogen wird. (nur Client-Seite)"/>
-                        <spinner label="Weichheit" name="FlexNumSections"/>
+                        <spinner label="Weichheit:" name="FlexNumSections"/>
-                        <spinner label="Schwerkraft" name="FlexGravity"/>
+                        <spinner label="Schwerkraft:" name="FlexGravity"/>
-                        <spinner label="Ziehen" name="FlexFriction"/>
+                        <spinner label="Ziehen:" name="FlexFriction"/>
-                        <spinner label="Wind" name="FlexWind"/>
+                        <spinner label="Wind:" name="FlexWind"/>
-                        <spinner label="Spannung" name="FlexTension"/>
+                        <spinner label="Spannung:" name="FlexTension"/>
-                        <spinner label="Erzwingen X" name="FlexForceX"/>
+                        <spinner label="Erzwingen X:" name="FlexForceX"/>
-                        <spinner label="Erzwingen Y" name="FlexForceY"/>
+                        <spinner label="Erzwingen Y:" name="FlexForceY"/>
-                        <spinner label="Erzwingen Z" name="FlexForceZ"/>
+                        <spinner label="Erzwingen Z:" name="FlexForceZ"/>
-                        <check_box label="Licht" name="Light Checkbox Ctrl" tool_tip="Verursacht, dass Objekt Licht emittiert"/>
+                        <check_box label="Licht" name="Light Checkbox Ctrl" tool_tip="Verursacht, dass das Objekt Licht ausstrahlt"/>
                        <text name="label color">
-                                Farbe
+                                Farbe:
                        </text>
                        <color_swatch label="" name="colorswatch" tool_tip="Klicken, um Farbauswahl zu öffnen"/>
-                        <spinner label="Intensität" name="Light Intensity"/>
+                        <spinner label="Intensität:" name="Light Intensity"/>
-                        <spinner label="Radius" name="Light Radius"/>
+                        <spinner label="Radius:" name="Light Radius"/>
-                        <spinner label="Abnehmend" name="Light Falloff"/>
+                        <spinner label="Abnehmend:" name="Light Falloff"/>
                </panel>
+<!-- Texture sub-tab -->
                <panel label="Textur" name="Texture">
                        <texture_picker label="Textur" name="texture control" tool_tip="Klicken, um ein Bild zu wählen"/>
                        <color_swatch label="Farbe" name="colorswatch" tool_tip="Klicken, um Farbauswahl zu öffnen"/>
@@ -517,12 +592,14 @@ Primitiv" name="sculpt texture control" tool_tip="Klicken Sie hier, um ein Bild
                                        Stuck
                                </combo_item>
                                <combo_item name="suction">
-                                        Saugen
+                                        Sog
                                </combo_item>
                                <combo_item name="weave">
-                                        gewoben
+                                        Gewebe
                                </combo_item>
                        </combo_box>
+                        <check_box label="Ebene Texturen ausrichten"
+                             name="checkbox planar align"                                                       tool_tip="Richtet Texturen auf allen ausgewählten Flächen nach der letzten Fläche aus. Benötigt ebene Texturzuordnung." />
                        <text name="tex scale">
                                Wiederholungen
                        </text>
@@ -553,32 +630,40 @@ Primitiv" name="sculpt texture control" tool_tip="Klicken Sie hier, um ein Bild
 (zuerst laden)
                        </text>
                        <button label="Ausrichten" label_selected="Ausrichten" name="button align"/>
+                <button label="Textur Mathe" label_selected="Textur Mathe" tool_tip="Texture math constants" name="texture_math_constants" />
                </panel>
                <panel label="Inhalt" name="Contents">
                        <button label="Neues Skript" label_selected="Neues Skript..." name="button new script"/>
                        <button label="Berechtigungen..." name="button permissions" width="118"/>
+                        <panel name="ContentsInventory" />
                </panel>
        </tab_container>
+<!-- Land Info sub-tab -->
        <panel name="land info panel">
+        <!-- Parcel Information -->
                <text name="label_parcel_info">
-                        Parzelleninformation
+                        Parzelleninformation:
                </text>
                <text name="label_area_price">
-                        Preis: L$ [PRICE] für [AREA] m2.
+                        Preis: [CURRENCY][PRICE] für [AREA] m2.
                </text>
                <text name="label_area">
                        Fläche: [AREA] m2
                </text>
-                <button label="Info zu Land..." label_selected="Info zu Land..." name="button about land" width="110"/>
+                <button label="Landinfo..." label_selected="Landinfo..." name="button about land" width="110" />
                <check_box label="Eigentümer anzeigen" name="checkbox show owners" tool_tip="Parzellen nach Eigentümer farbig kennzeichnen"/>
                <button label="?" label_selected="?" name="button show owners help" left_delta="130"/>
+        <!-- Modify Parcel -->
                <text name="label_parcel_modify">
-                        Parzelle ändern
+                        Parzelle ändern:
                </text>
                <button label="Unterteilen..." label_selected="Unterteilen..." name="button subdivide land" width="110"/>
                <button label="Zusammenlegen" label_selected="Zusammenlegen" name="button join land" width="110"/>
+        <!-- Land Transactions -->
                <text name="label_parcel_trans">
-                        Land-Transaktionen
+                        Land-Transaktionen:
                </text>
                <button label="Land kaufen..." label_selected="Land kaufen..." name="button buy land" width="110"/>
                <button label="Land aufgeben..." label_selected="Land aufgeben..." name="button abandon land" width="110"/>
@@ -602,7 +687,7 @@ Primitiv" name="sculpt texture control" tool_tip="Klicken Sie hier, um ein Bild
                Ziehen, um Objekte zu verschieben, Strg zum Heben, Strg-Umschalt zum Drehen
        </string>
        <string name="status_place">
-                Inworld klicken, um zu bauen.
+                In-Welt klicken, um zu bauen
        </string>
        <string name="status_selectland">
                Klicken und ziehen, um Land auszuwählen
diff --git a/linden/indra/newview/skins/default/xui/de/floater_top_objects.xml b/linden/indra/newview/skins/default/xui/de/floater_top_objects.xml
index f9e7bec..8a196b1 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_top_objects.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_top_objects.xml
@@ -41,7 +41,7 @@
                Zeit
        </string>
        <string name="scripts_mono_time_label">
-                Mono-Uhrzeit:
+                Mono-Uhrzeit
        </string>
        <string name="top_colliders_title">
                Top-Kollisionsobjekte
diff --git a/linden/indra/newview/skins/default/xui/de/floater_tos.xml b/linden/indra/newview/skins/default/xui/de/floater_tos.xml
index 42f48fa..b3fa2a4 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_tos.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_tos.xml
@@ -2,18 +2,8 @@
 <floater name="modal container" title=" ">
        <button label="Weiter" label_selected="Weiter" name="Continue" />
        <button label="Abbrechen" label_selected="Abbrechen" name="Cancel" />
-        <radio_group name="tos_agreement">
+        <check_box label="Ich stimme den Nutzungsbedingungen zu"
-                <radio_item name="radio_disagree">
+                name="agree_chk" />
-                        Ich stimme den Nutzungsbedingungen nicht zu
-                </radio_item>
-                <radio_item name="radio_agree">
-                        Ich stimme den Nutzungsbedingungen zu
-                </radio_item>
-        </radio_group>
-        <text name="tos_title">
-                Nutzungsvereinbarung
-        </text>
-        <check_box label="Ich stimme den Nutzungsbedingungen zu" name="agree_chk" />
        <text name="tos_heading">
                Lesen Sie die folgenden Nutzungsbedingungen sorgfältig durch. Sie müssen dieser Vereinbarung
 zustimmen, um Second Life benutzen zu können.
@@ -21,7 +11,8 @@ zustimmen, um Second Life benutzen zu können.
        <text_editor name="tos_text">
                TOS_TEXT
        </text_editor>
-        <text name="real_url">
+        <string name="real_url">
                http://secondlife.com/app/tos/
-        </text>
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_voice_license.xml b/linden/indra/newview/skins/default/xui/de/floater_voice_license.xml
new file mode 100644
index 0000000..a79224b
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/de/floater_voice_license.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="modal container" title="">
+  <button label="Weiter" label_selected="Weiter" name="Continue" />
+  <button label="Abbrechen" label_selected="Abbrechen" name="Cancel" />
+  <check_box label="Ich stimme den Bedingungen der Vivox-Richtlinie zur akzeptieren Nutzung zu"
+name="agree_chk" />
+  <text name="license_heading">
+Bitte lesen Sie das folgende Dokument sorgfältig durch.
+Um Vivox Sprach-Chat nutzen zu können, müssen Sie den Bedingungen zustimmen.
+  </text>
+  <text_editor name="license_text">
+    LICENSE_TEXT
+  </text_editor>
+ 
+  <string name="real_url">
+    http://www.vivox.com/vivox_aup.html
+  </string>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_water.xml b/linden/indra/newview/skins/default/xui/de/floater_water.xml
index 95b4694..b768a12 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_water.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_water.xml
@@ -4,7 +4,15 @@
                Voreinstellungen:
        </text>
        <button label="Neu" label_selected="Neu" name="WaterNewPreset" />
-        <button label="Speichern" label_selected="Speichern" name="WaterSavePreset" />
+        <flyout_button label="Auf Platte speichern"
+       name="WaterSavePreset">
+                <flyout_button_item name="save_inventory_item">
+        In Inventar speichern
+                </flyout_button_item>
+                <flyout_button_item name="save_disk_item">
+        Auf Platte speichern
+                </flyout_button_item>
+        </flyout_button>
        <button label="Löschen" label_selected="Löschen" name="WaterDeletePreset" />
        <tab_container name="Water Tabs">
                <panel label="Einstellungen" name="Settings">
@@ -12,7 +20,7 @@
                                Wassertrübungsfarbe
                        </text>
                        <button label=" ?" name="WaterFogColorHelp" left="175" />
-                        <color_swatch name="WaterFogColor" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen" />
+                        <color_swatch name="WaterFogColor" tool_tip="Hier klicken, um die Farbauswahl zu öffnen" />
                        <text name="WaterFogDensText">
                                Wassertrübungsdichte
                        </text>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_wearable_save_as.xml b/linden/indra/newview/skins/default/xui/de/floater_wearable_save_as.xml
index 89e351e..5ca57e4 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_wearable_save_as.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_wearable_save_as.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="modal container" title=" ">
+<floater name="modal container" title="">
        <button label="Speichern" label_selected="Speichern" name="Save" />
        <button label="Abbrechen" label_selected="Abbrechen" name="Cancel" />
        <text type="string" length="1" name="Save item as:">
diff --git a/linden/indra/newview/skins/default/xui/de/floater_windlight_options.xml b/linden/indra/newview/skins/default/xui/de/floater_windlight_options.xml
index 8df412d..09ffcd2 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_windlight_options.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_windlight_options.xml
@@ -4,10 +4,15 @@
                Voreinstellungen:
        </text>
        <button label="Neu" label_selected="Neu" name="WLNewPreset" />
-        <button label="Speichern" label_selected="Speichern" name="WLSavePreset" />
+        <flyout_button label="Auf Platte speichern" name="WLSavePreset">
+        <flyout_button_item name="save_inventory_item">
+      In Inventar speichern
+        </flyout_button_item>
+        <flyout_button_item name="save_disk_item">
+      Auf Platte speichern
+        </flyout_button_item>
+        </flyout_button>
        <button label="Löschen" label_selected="Löschen" name="WLDeletePreset" />
-        <button label="Tageszyklus-Editor" label_selected="Tageszyklus-Editor"
-             name="WLDayCycleMenuButton" />
        <tab_container name="WindLight Tabs">
                <panel label="Atmosphäre" name="Atmosphere">
                        <text name="BHText">
@@ -184,6 +189,8 @@
                        <button label=" ?" name="WLClassicCloudsHelp" />
                </panel>
        </tab_container>
+        <button label="Tageszyklus-Editor" label_selected="Tageszyklus-Editor"
+             name="WLDayCycleMenuButton" />
        <string name="WLDefaultSkyNames">
                A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
        </string>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_world_map.xml b/linden/indra/newview/skins/default/xui/de/floater_world_map.xml
index d28b55e..e0d95e6 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_world_map.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_world_map.xml
@@ -14,19 +14,19 @@
                Auktion
        </text>
        <text font="SansSerifSmall" name="land_for_sale_label">
-                Land erhaeltlich
+                Land zum Verkauf
        </text>
-        <button label="Nach Hause" label_selected="Nach Hause" name="Go Home" tool_tip="Nach Hause teleportieren"/>
+        <button label="Nach Hause" label_selected="Nach Hause" name="Go Home" tool_tip="Zu Ihrem Zuhause teleportieren"/>
        <check_box label="Einwohner" name="people_chk"/>
        <check_box label="Infohub" name="infohub_chk"/>
        <check_box label="Telehub" name="telehubchk"/>
-        <check_box label="Land zu verkaufen" name="land_for_sale_chk"/>
+        <check_box label="Land zum Verkauf" name="land_for_sale_chk"/>
        <text name="events_label">
                Events:
        </text>
        <check_box label="PG" name="event_chk"/>
-        <check_box label="Mature" name="event_mature_chk"/>
+        <check_box label="Reif" name="event_mature_chk"/>
-        <check_box label="Adult" name="event_adult_chk"/>
+        <check_box label="Erwachsen" name="event_adult_chk"/>
        <combo_box label="Online-Freunde" name="friend combo" tool_tip="Freund, der auf Karte angezeigt werden soll">
                <combo_item name="none_selected">
                        Online-Freunde
@@ -47,15 +47,15 @@
                <column label="" name="sim_name"/>
        </scroll_list>
        <text name="location_label">
-                Standort:
+                Ort:
        </text>
-        <spinner name="spin x" tool_tip="X-Koordinate der Position auf der Karte"/>
+        <spinner name="spin x" tool_tip="X-Koordinate des Ortes auf der Karte"/>
-        <spinner name="spin y" tool_tip="Y-Koordinate der Position auf der Karte"/>
+        <spinner name="spin y" tool_tip="Y-Koordinate des Ortes auf der Karte"/>
-        <spinner name="spin z" tool_tip="Z-Koordinate der Position auf der Karte"/>
+        <spinner name="spin z" tool_tip="Z-Koordinate des Ortes auf der Karte"/>
-        <button label="Teleportieren" label_selected="Teleportieren" name="Teleport" tool_tip="Zu ausgewählter Position teleportieren"/>
+        <button label="Teleportieren" label_selected="Teleportieren" name="Teleport" tool_tip="Zu ausgewähltem Ort teleportieren"/>
-        <button label="Gesuchte Position" label_selected="Ziel anzeigen" name="Show Destination" tool_tip="Karte auf ausgewählte Position zentrieren"/>
+        <button label="Ziel anzeigen" label_selected="Ziel anzeigen" name="Show Destination" tool_tip="Karte auf ausgewählten Ort zentrieren"/>
        <button label="Löschen" label_selected="Löschen" name="Clear" tool_tip="Verfolgung abschalten"/>
-        <button label="Meine Position" label_selected="Wo bin ich?" name="Show My Location" tool_tip="Karte auf Position Ihres Avatars zentrieren"/>
+        <button label="Meine Position" label_selected="Meine Position" name="Show My Location" tool_tip="Karte auf Position Ihres Avatars zentrieren"/>
-        <button font="SansSerifSmall" label="SLURL in die Zwischenablage kopieren" name="copy_slurl" tool_tip="Kopiert die aktuelle Position als SLURL zur Verwendung im Web."/>
+        <button font="SansSerifSmall" label="SLURL in Zwischenablage kopieren" name="copy_slurl" tool_tip="Kopiert die aktuelle Position als SLURL zur Verwendung im Internet."/>
        <slider label="Zoom" name="zoom slider"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/de/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/de/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</menu>
diff --git a/linden/indra/newview/skins/default/xui/de/panel_friends.xml b/linden/indra/newview/skins/default/xui/de/panel_friends.xml
index bb2adb3..cd56366 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_friends.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_friends.xml
@@ -11,6 +11,8 @@
                <column name="icon_visible_map" tool_tip="Freund kann Sie auf der Karte finden" />
                <column name="icon_edit_mine"
                     tool_tip="Freunde können Objekte bearbeiten, löschen und an sich nehmen" />
+                <column name="icon_visible_map_theirs"
+                     tool_tip="Sie können den Freund auf der Karte finden" width="20" />
                <column name="icon_edit_theirs"
                     tool_tip="Sie können die Objekte dieses Freunds bearbeiten" />
        </scroll_list>
diff --git a/linden/indra/newview/skins/default/xui/de/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/de/panel_status_bar.xml
index 565e6b8..6c2da13 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_status_bar.xml
@@ -6,7 +6,7 @@
        <text length="1" name="BalanceText" tool_tip="Kontostand" type="string">
                Wird geladen...
        </text>
-        <button label="" label_selected="" name="buycurrency" tool_tip="Geld kaufen"/>
+        <button label="[CURRENCY]" label_selected="" name="buycurrency" tool_tip="Geld kaufen"/>
        <text length="12" name="TimeText" tool_tip="Aktuelle Zeit (Pazifik)" type="string">
                12:00
        </text>
diff --git a/linden/indra/newview/skins/default/xui/de/strings.xml b/linden/indra/newview/skins/default/xui/de/strings.xml
index f692f9e..154dfee 100644
--- a/linden/indra/newview/skins/default/xui/de/strings.xml
+++ b/linden/indra/newview/skins/default/xui/de/strings.xml
@@ -484,7 +484,7 @@
        <string name="xml_file">
                XML-Datei
        </string>
-        <string name="dot_raw_file">
+        <string name="raw_file">
                RAW-Datei
        </string>
        <string name="compressed_image_files">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
index db4e11d..0b73d9b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
@@ -3,69 +3,94 @@
     can_resize="false" height="440" min_height="100" min_width="100"
     name="floater_about" rect_control="FloaterAboutRect"
     title="About Second Life" width="470">
-        <text_editor bottom="-434" embedded_items="false"
+  <tab_container
-             follows="left|top|right|bottom" font="SansSerifSmall" height="168" left="6"
+                 follows="all"
-  max_length="65536" mouse_opaque="true" name="credits_editor" width="458"
+                 bottom="10"
-  word_wrap="true">
+                 left="10"
-  The Imprudence Viewer was rocked hard by:
+                 height="405"
-  Jacek Antonelli, McCabe Maxsted, Armin Weatherwax, Elektra Hesse, and CodeBastard Redgrave. 
+                 width="450"
-  http://kokuaviewer.org/
+                 name="about_tab"
-  
+                 tab_position="top">
-  Imprudence is so awesome thanks to contributions from many generous people:
+    <panel
-  
+      border="true"
-  For their patches and code contributions, we thank Admiral Admiral, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Archimedies Plutonian, Angus Boyd, Ansariel Hiller, Ardy Lay, Asuka Neely, Balp Allen, Carjay McGinnis, Chalice Yao, Dale Glass, Damian Delacrois, Danny Nolan, Felix Duesenburg, Geneko Nemeth, Henri Beauchamp, Katharine Berry, KirstenLee Cinquetti, Kitty Barnett, Latif Khalifa, Lilly Zenovka, Makomk Makosen, Mana Janus, Matthew Dowd, Michelle2 Zenovka, Mm Alder, Nemurimasu Neiro, Nicholaz Beresford, Patrick Sapinski, Paul Churchill, Peter Lameth, Robin Cornelius, Stephen Zenith, Thickbrick Sleaford, Thomas Shikami, Tom Meta, tx Oh, Vaalith Jinn, Vadim Bigbear, Vex Streeter, Zi Ree, and Zwagoth Klaar.
+      height="386"
-  
+      label="Version"
-  For their WindLight presets, we thank Ana Lutetia, CodeBastard Redgrave, and Torley Linden.
+      help_topic="about_support_tab"
-  
+      name="support_panel">
-  Thanks also to the developer(s) of the Emerald Viewer, Hippo Viewer, Cool VL Viewer, Snowglobe Viewer, Meta7 Viewer, FrozenGlobe Viewer, and Meerkat Viewer for viewer enhancements we have incorporated, as well as Kitty Barnett for RLVa. Special thanks to the folks at Linden Lab for releasing the viewer source, without which this endeavor would have been impossible.
+      <text_editor bottom="28" embedded_items="false"
-  
+         follows="left|top|right|bottom" font="SansSerif" height="352" left="6"
-  For a complete list of who did what, read the release notes!
+         max_length="65536" mouse_opaque="true" name="support_editor" width="423"
-  
+         word_wrap="true" />
+      <button follows="left|top" label="Copy to Clipboard" name="copy_btn"
+         left="5" bottom="0" top_pad="5" height="20" width="180" />
+    </panel>
+    <panel
+        border="true"
+        label="Credits"
+        height="386"
+        help_topic="about_credits_tab"
+        name="credits_panel">
+      <text_editor bottom="6" embedded_items="false"
+           follows="left|top|right|bottom" font="SansSerifSmall" height="374" left="6"
+           max_length="65536" mouse_opaque="true" name="credits_editor" width="423"
+           word_wrap="true">
+        The Imprudence Viewer was rocked hard by:
+        Jacek Antonelli, McCabe Maxsted, Armin Weatherwax, Elektra Hesse, and CodeBastard Redgrave.
+        http://kokuaviewer.org/
-  Second Life Copyright (C) 1999-2009 Linden Research Inc.
+        Imprudence is so awesome thanks to contributions from many generous people:
-  
-  Second Life is brought to you by Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl and many others.
-  Thank you to the following residents for helping to ensure that this is the best version yet: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, 
+        For their patches and code contributions, we thank Admiral Admiral, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Archimedies Plutonian, Angus Boyd, Ansariel Hiller, Ardy Lay, Asuka Neely, Balp Allen, Carjay McGinnis, Chalice Yao, Dale Glass, Damian Delacrois, Danny Nolan, Felix Duesenburg, Geneko Nemeth, Henri Beauchamp, Katharine Berry, KirstenLee Cinquetti, Kitty Barnett, Latif Khalifa, Lilly Zenovka, Makomk Makosen, Mana Janus, Matthew Dowd, Michelle2 Zenovka, Mm Alder, Nemurimasu Neiro, Nicholaz Beresford, Patrick Sapinski, Paul Churchill, Peter Lameth, Robin Cornelius, Stephen Zenith, Thickbrick Sleaford, Thomas Shikami, Tom Meta, tx Oh, Vaalith Jinn, Vadim Bigbear, Vex Streeter, Zi Ree, and Zwagoth Klaar.
-Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, 
-Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, 
-Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, 
-Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, 
-Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
-  3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
+        For their WindLight presets, we thank Ana Lutetia, CodeBastard Redgrave, and Torley Linden.
-  APR Copyright (C) 2000-2004 The Apache Software Foundation
-  cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
-  DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
-  expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-  FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
-  GL Copyright (C) 1999-2004 Brian Paul.
-  Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
-  jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
-  jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
-  ogg/vorbis Copyright (C) 2001, Xiphophorus
-  OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
-  SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
-  SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-  xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
-  zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-  google-perftools Copyright (c) 2005, Google Inc.
-  Code from FAAD2 is copyright (c) Nero AG, www.nero.com
-  All rights reserved.  See LICENSE-libraries.txt for details.
+        Thanks also to the developer(s) of the Emerald Viewer, Hippo Viewer, Cool VL Viewer, Snowglobe Viewer, Meta7 Viewer, FrozenGlobe Viewer, and Meerkat Viewer for viewer enhancements we have incorporated, as well as Kitty Barnett for RLVa. Special thanks to the folks at Linden Lab for releasing the viewer source, without which this endeavor would have been impossible.
-  Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
+        For a complete list of who did what, read the release notes!
-  Begin, be bold and venture to be wise. -- Horace
+        Second Life Copyright (C) 1999-2009 Linden Research Inc.
-  If you don't like something, change it. If you can't change it, change your attitude. -- Maya Angelou </text_editor>
+        Second Life is brought to you by Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl and many others.
-        <text_editor bottom_delta="174" embedded_items="false"
+        Thank you to the following residents for helping to ensure that this is the best version yet: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime,
-             follows="left|top|right|bottom" font="SansSerif" height="238" left="6"
+        Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida,
-             max_length="65536" mouse_opaque="true" name="support_editor" width="458"
+        Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao,
-             word_wrap="true" />
+        Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi,
-        <string name="you_are_at">
+        Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky,
+        Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
+        3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
+        APR Copyright (C) 2000-2004 The Apache Software Foundation
+        cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+        DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
+        expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
+        FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
+        GL Copyright (C) 1999-2004 Brian Paul.
+        Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
+        jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
+        jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
+        ogg/vorbis Copyright (C) 2001, Xiphophorus
+        OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
+        SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
+        SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+        xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
+        zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
+        google-perftools Copyright (c) 2005, Google Inc.
+        Code from FAAD2 is copyright (c) Nero AG, www.nero.com
+        All rights reserved.  See LICENSE-libraries.txt for details.
+        Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
+        Begin, be bold and venture to be wise. -- Horace
+        If you don't like something, change it. If you can't change it, change your attitude. -- Maya Angelou
+      </text_editor>
+    </panel>
+  </tab_container>
+  <string name="you_are_at">
                You are at [POSITION]
        </string>
 </floater>
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 966dc2d..453bf46 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
@@ -32,7 +32,7 @@
                             font="SansSerifSmall" handle_edit_keys_directly="false" height="52"
                             left="96" max_length="255" mouse_opaque="true" name="Description"
                             select_all_on_focus_received="false" select_on_focus="false"
-                             width="350" word_wrap="true" />
+                             width="350" word_wrap="true" spell_check="true" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-100" drop_shadow_visible="true" enabled="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
@@ -292,7 +292,7 @@ Go to World menu > About Land or select another parcel to show its details.
                        <text_editor type="string" length="1" bottom="-175" embedded_items="false" enabled="false"
                             follows="left|top|right|bottom" font="SansSerifSmall" height="115"
                             left="120" max_length="65535" mouse_opaque="true" name="covenant_editor"
-                             width="330" word_wrap="true">
+                             width="330" word_wrap="true" spell_check="true">
                                There is no Covenant provided for this Estate.
                        </text_editor>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -800,143 +800,603 @@ Only large parcels can be listed in search.
                                No Pushing (Region Override)
                        </string>
                </panel>
-                <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
+                <panel
-                     height="363" label="Media" left="1" mouse_opaque="true"
+                         border="true"
-                     name="land_media_panel" width="458">
+                         border_visible="true"
-                        <text type="string" length="1" bottom="-25" follows="left|top" font="SansSerifSmall" halign="left" height="16"
+                         bottom="-363"
-                             left="10" mouse_opaque="true" name="with media:" width="65">
+                         enabled="true"
-                                Media Type:
+                         follows="left|top|right|bottom"
-                        </text>
+                         height="513"
-                        <combo_box allow_text_entry="false" bottom_delta="0" follows="left|top" height="18"
+                         label="Media"
-                             left="80" max_chars="20" name="media type"
+                         left="1"
-                             tool_tip="Specify if the URL is a movie, web page, or other media"
+                         mouse_opaque="true"
-                             width="120" />
+                         name="land_media_panel"
-                        <text bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+                         width="458">
-                             left_delta="130" name="mime_type" width="200" />
+                        <text
-                        <text type="string" length="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="left"
+                                 bottom="-25"
-                             height="16" left="10" name="at URL:" width="65">
+                                 follows="left|top"
-                                Media URL:
+                                 font="SansSerifSmall"
-                        </text>
+                                 halign="left"
-                        <line_editor bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16" left="80"
+                                 height="16"
-                             max_length="255" name="media_url" right="-80"
+                                 left="10"
-                             select_all_on_focus_received="true" select_on_focus="true"
+                                 length="1"
-                             text_readonly_color="0.576471 0.662745 0.835294 1" />
+                                 mouse_opaque="true"
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
+                                 name="with media:"
-                             height="16" label="Set..." label_selected="Set..." mouse_opaque="true"
+                                 type="string"
-                             name="set_media_url" right="-12" scale_image="true" width="60" />
+                                 width="65">
-                        <text type="string" length="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="left"
+                                Type:
-                             height="16" left="10" name="Description:" width="364">
+                        </text>
+                        <combo_box
+                                 allow_text_entry="false"
+                                 bottom_delta="0"
+                                 follows="left|top"
+                                 height="18"
+                                 left="80"
+                                 max_chars="20"
+                                 name="media type"
+                                 tool_tip="Specify if the URL is a movie, web page, or other media"
+                                 width="120" />
+                        <text
+                                 bottom_delta="0"
+                                 follows="left|top"
+                                 font="SansSerifSmall"
+                                 height="16"
+                                 left_delta="130"
+                                 name="mime_type"
+                                 width="200" />
+                        <text type="string"
+                                 bottom_delta="-21"
+                                 follows="left|top"
+                                 font="SansSerifSmall" halign="left"
+                                 height="16"
+                                 left="10"
+                                 length="1"
+                                 name="at URL:"
+                                 width="65">
+                                Home URL:
+                        </text>
+                        <line_editor
+                                 bottom_delta="0"
+                                 follows="left|top|right"
+                                 font="SansSerifSmall"
+                                 height="16"
+                                 left="80"
+                                 max_length="255"
+                                 name="media_url"
+                                 right="-90"
+                                 select_all_on_focus_received="true"
+                                 select_on_focus="true"
+                                 text_readonly_color="0.576471 0.662745 0.835294 1" />
+                        <button
+                                 bottom_delta="0"
+                                 follows="right|top"
+                                 font="SansSerifSmall"
+                                 halign="center"
+                                 height="16"
+                                 label="Set..."
+                                 label_selected="Set..."
+                                 mouse_opaque="true"
+                                 name="set_media_url"
+                                 right="-12"
+                                 scale_image="true"
+                                 width="70" />
+                        <text
+                                 bottom_delta="-22"
+                                 follows="left|top"
+                                 font="SansSerifSmall"
+                                 halign="left"
+                                 height="16"
+                                 left="10"
+                                 length="1"
+                                 name="at URL:"
+                                 type="string"
+                                 width="65">
+                                Current URL:
+                        </text>
+                        <text
+                                 bottom_delta="0"
+                                 follows="left|top|right"
+                                 font="SansSerifSmall"
+                                 halign="left"
+                                 height="16"
+                                 left="80"
+                                 name="current_url"
+                                 right="-90" />
+                        <button
+                                 bottom_delta="0"
+                                 follows="right|top"
+                                 font="SansSerifSmall"
+                                 halign="center"
+                                 height="16"
+                                 label="Reset..."
+                                 label_selected="Reset..."
+                                 mouse_opaque="true"
+                                 name="reset_media_url"
+                                 right="-12"
+                                 scale_image="true"
+                                 width="70" />
+                        <text
+                                 bottom_delta="-22"
+                                 follows="right|top"
+                                 font="SansSerifSmall"
+                                 halign="left"
+                                 height="16"
+                                 length="1"
+                                 name="media_reset"
+                                 left="80"
+                                 tool_tip="Amount of time until parcel automatically reverts to default URL (0 for never return)"
+                                 type="string"
+                                 width="120">
+                                Return to Home URL in:
+                        </text>
+                        <spinner
+                                 bottom_delta="0"
+                                 decimal_digits="0"
+                                 enabled="false"
+                                 follows="right|top"
+                                 height="16"
+                                 increment="1"
+                                 initial_val="0"
+                                 max_val="1024"
+                                 min_val="0"
+                                 name="media_reset_time"
+                                 left_delta="126"
+                                 tool_tip="Amount of time until parcel reverts to default URL (0 for never return)"
+                                 width="64" />
+                        <text
+                                 bottom_delta="0"
+                                 follows="right|top"
+                                 font="SansSerifSmall"
+                                 halign="left"
+                                 height="16"
+                                 left_delta="72"
+                                 length="1"
+                                 name="minutes"
+                                 type="string">
+                                minutes
+                        </text>
+                        <text
+                                 bottom_delta="-22"
+                                 follows="left|top"
+                                 font="SansSerifSmall"
+                                 halign="left"
+                                 height="16"
+                                 left="10"
+                                 length="1"
+                                 name="Description:"
+                                 type="string"
+                                 width="364">
                                Description:
                        </text>
-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+                        <line_editor
-                             follows="left|top" font="SansSerifSmall" height="16" left="80"
+                                 bevel_style="in"
-                             max_length="255" name="url_description" right="-80"
+                                 border_style="line"
-                             select_all_on_focus_received="true" select_on_focus="true"
+                                 border_thickness="1"
-                             tool_tip="Text displayed next to play/load button" />
+                                 bottom_delta="0"
-                        <text type="string" length="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="left"
+                                 follows="left|top|right"
-                             height="16" left="10" name="Media texture:" width="364">
+                                 font="SansSerifSmall"
-                                Replace
+                                 height="16"
-Texture:
+                                 left="80"
-                        </text>
+                                 max_length="255"
-                        <texture_picker allow_no_texture="true" bottom_delta="-64" can_apply_immediately="false"
+                                 name="url_description"
-                             default_image_name="Default" follows="left|top" height="80" label=""
+                                 right="-90"
-                             left="80" name="media texture" tool_tip="Click to choose a picture"
+                                 select_all_on_focus_received="true"
-                             width="64" />
+                                 select_on_focus="true"
-                        <text type="string" length="1" bottom_delta="48" follows="left|top" font="SansSerifSmall" halign="left"
+                                 tool_tip="Text displayed next to play/load button" />
-                             height="16" left_delta="75" name="replace_texture_help" width="270">
+                        <text
-                                (Objects using this texture will show the movie or
+                                 bottom_delta="-28"
-web page after you click the play arrow.)
+                                 follows="left|top"
-                        </text>
+                                 font="SansSerifSmall"
-                        <text type="string" length="1" bottom_delta="-55" follows="left|top" font="SansSerifSmall" halign="left"
+                                 halign="left"
-                             height="16" left="10" mouse_opaque="true" name="Options:" width="292">
+                                 height="16"
-                                Media
+                                 left="10"
-Options:
+                                 length="1"
-                        </text>
+                                 name="Media texture:"
-                        <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
+                                 type="string"
-                             height="16" initial_value="false" label="Auto scale" left="80"
+                                 width="364">
-                             mouse_opaque="true" name="media_auto_scale" radio_style="false"
+                                Texture:
-                             tool_tip="Checking this option will scale the content for this parcel automatically. It may be slightly slower and lower quality visually but no other texture scaling or alignment will be required."
+                        </text>
-                             width="200" />
+                        <texture_picker
-                        <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
+                                 allow_no_texture="true"
-                             height="16" initial_value="false" label="Loop Media" left="250"
+                                 bottom_delta="-64"
-                             mouse_opaque="true" name="media_loop" radio_style="false"
+                                 can_apply_immediately="false"
-                             tool_tip="Play media in a loop.  When the media has finished playing, it will restart from the beginning."
+                                 default_image_name="Default"
-                             width="200" />
+                                 follows="left|top"
-                        <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
+                                 height="80"
-                             height="16" initial_value="false" label="Hide Media URL" left="80"
+                                 label=""
-                             mouse_opaque="true" name="hide_media_url" radio_style="false"
+                                 left="80"
-                             tool_tip="Checking this option will hide the media url to any non-authorized viewers of this parcel information. Note this is not available for HTML types."
+                                 name="media texture"
-                             width="200" />
+                                 tool_tip="Click to choose a texture"
-                        <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
+                                 width="64" />
-                             height="16" initial_value="false" label="Hide Music URL" left="250"
+                        <text
-                             mouse_opaque="true" name="hide_music_url" radio_style="false"
+                                 type="string"
-                             tool_tip="Checking this option will hide the music url to any non-authorized viewers of this parcel information"
+                                 length="1"
-                             width="200" />
+                                 bottom_delta="0"
-                        <text type="string" length="1" bottom_delta="-25" follows="left|top" font="SansSerifSmall" halign="left"
+                                 follows="left|top"
-                             height="16" left="85" name="media_size"
+                                 font="SansSerifSmall"
-                             tool_tip="Size to render Web media, leave 0 for default." width="85">
+                                 halign="left"
-                                Media size:
+                                 height="80"
-                        </text>
+                                 left_delta="75"
-                        <spinner bottom_delta="0" decimal_digits="0" enabled="false" follows="left|top"
+                                 name="replace_texture_help"
-                             halign="right" height="16" increment="1" initial_val="0" left_delta="65"
+                                 width="270">
-                             max_val="1024" min_val="0" name="media_size_width"
+                                Objects using this texture will show the movie or
-                             tool_tip="Size to render Web media, leave 0 for default." width="64" />
+web page after you click the play arrow.
-                        <spinner bottom_delta="0" decimal_digits="0" enabled="false" follows="left|top"
-                             halign="right" height="16" increment="1" initial_val="0" left_delta="80"
+Select the thumbnail to choose a different texture.
-                             max_val="1024" min_val="0" name="media_size_height"
+                        </text>
-                             tool_tip="Size to render Web media, leave 0 for default." width="64" />
+                        <text
-                        <text type="string" length="1" bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="left"
+                                 bottom_delta="-16"
-                             height="16" left_delta="70" name="pixels" right="-10">
+                                 follows="left|top"
+                                 font="SansSerifSmall"
+                                 halign="left"
+                                 height="16"
+                                 left="10"
+                                 length="1"
+                                 mouse_opaque="true"
+                                 name="Options:"
+                                 top_delta="0"
+                                 type="string"
+                                 width="64">
+                                Options:
+                        </text>
+                        <check_box
+                                 bottom_delta="0"
+                                 enabled="true"
+                                 follows="left|top"
+                                 font="SansSerifSmall"
+                                 height="16"
+                                 initial_value="false"
+                                 label="Loop"
+                                 left="80"
+                                 mouse_opaque="true"
+                                 name="media_loop"
+                                 radio_style="false"
+                                 tool_tip="Play media in a loop.  When the media has finished playing, it will restart from the beginning."
+                                 width="200" />
+                        <check_box
+                                 bottom_delta="0"
+                                 enabled="true"
+                                 follows="left|top"
+                                 font="SansSerifSmall"
+                                 height="16"
+                                 initial_value="false"
+                                 label="Auto scale"
+                                 left_delta="80"
+                                 mouse_opaque="true"
+                                 name="media_auto_scale"
+                                 radio_style="false"
+                                 tool_tip="Checking this option will scale the content for this parcel automatically. It may be slightly slower and lower quality visually but no other texture scaling or alignment will be required."
+                                 width="200" />
+                        <text
+                                 bottom_delta="-24"
+                                 follows="left|top"
+                                 font="SansSerifSmall"
+                                 halign="left"
+                                 height="16"
+                                 left="10"
+                                 length="1"
+                                 name="media_size"
+                                 tool_tip="Size to render Web media, leave 0 for default."
+                                 type="string"
+                                 width="85">
+                                Media Size:
+                        </text>
+                        <spinner
+                                 bottom_delta="0"
+                                 decimal_digits="0"
+                                 enabled="false"
+                                 follows="left|top"
+                                 halign="right"
+                                 height="16"
+                                 increment="1"
+                                 initial_val="0"
+                                 left="80"
+                                 max_val="1024"
+                                 min_val="0"
+                                 name="media_size_width"
+                                tool_tip="Width to render Web media, leave 0 for default."
+                                 width="60" />
+                        <spinner
+                                 bottom_delta="0"
+                                 decimal_digits="0"
+                                 enabled="false"
+                                 follows="left|top"
+                                 halign="right"
+                                 height="16"
+                                 increment="1"
+                                 initial_val="0"
+                                 left_delta="64"
+                                 max_val="1024"
+                                 min_val="0"
+                                 name="media_size_height"
+                                 tool_tip="Height to render Web media, leave 0 for default."
+                                 width="60" />
+                        <text
+                                 bottom_delta="0"
+                                 follows="left|top"
+                                 font="SansSerifSmall"
+                                 halign="left"
+                                 height="16"
+                                 left_delta="64"
+                                 length="1"
+                                 name="pixels"
+                                 type="string"
+                                 width="70">
                                pixels
                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                        <text
-                             bottom_delta="-40" drop_shadow_visible="true" enabled="true"
+                                 bg_visible="false"
-                             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+                                 border_drop_shadow_visible="false"
-                             height="16" left="10" mouse_opaque="true" name="MusicURL:" v_pad="0"
+                                 border_visible="false"
-                             width="364">
+                                 bottom_delta="-30"
+                                 drop_shadow_visible="true"
+                                 enabled="true"
+                                 follows="left|top"
+                                 font="SansSerifSmall"
+                                 h_pad="0"
+                                 halign="left"
+                                 height="16"
+                                 left="10"
+                                 length="1"
+                                 mouse_opaque="true"
+                                 name="Interaction:"
+                                 type="string"
+                                 v_pad="0"
+                                 width="364">
+                                Interaction:
+                        </text>
+                        <radio_group
+                                 bottom_delta="-2"
+                                 draw_border="false"
+                                 enabled="true"
+                                 follows="left|top"
+                                 height="22"
+                                 left="80"
+                                 mouse_opaque="true"
+                                 name="radio_navigate_allow"
+                                 tab_stop="true"
+                                 width="219">
+                                <radio_item
+                                         bottom="-20"
+                                         enabled="true"
+                                         follows="left|top"
+                                         height="16"
+                                         left="0"
+                                         length="1"
+                                         mouse_opaque="true"
+                                         name="Anyone"
+                                         tool_tip="Any resident can interact with media."
+                                         type="string"
+                                         width="70">
+                                        Anyone
+                                </radio_item>
+                                <radio_item
+                                         bottom="-20"
+                                         enabled="true"
+                                         follows="left|top"
+                                         height="16"
+                                         left="80"
+                                         length="1"
+                                         mouse_opaque="true"
+                                         name="Group"
+                                         tool_tip="Group permissions control who can interact with media."
+                                         type="string"
+                                         width="70">
+                                        Group
+                                </radio_item>
+                        </radio_group>
+                        <check_box
+                                 bottom_delta="-22"
+                                 enabled="true"
+                                 follows="left|top"
+                                 font="SansSerifSmall"
+                                 height="16"
+                                 initial_value="false"
+                                 label="Allow browsing only within these domains:"
+                                 left="80"
+                                 mouse_opaque="true"
+                                 name="check navigate filter"
+                                 radio_style="false"
+                                 width="292" />
+                        <line_editor
+                                 bevel_style="in"
+                                 border_style="line"
+                                 border_thickness="1"
+                                 bottom_delta="-20"
+                                 enabled="true"
+                                 follows="left|top|right"
+                                 font="SansSerifSmall"
+                                 handle_edit_keys_directly="false"
+                                 height="16"
+                                 left="80"
+                                 max_length="63"
+                                 mouse_opaque="true"
+                                 name="navigate_filter_domain"
+                                 right="-90"
+                                 select_all_on_focus_received="false"
+                                 select_on_focus="false" />
+                        <button
+                                 bottom_delta="0"
+                                 enabled="true"
+                                 follows="right|top"
+                                 font="SansSerifSmall"
+                                 halign="center"
+                                 height="16"
+                                 label="Add..."
+                                 label_selected="Add..."
+                                 right="-12"
+                                 mouse_opaque="true"
+                                 name="add_navigate_filter"
+                                 scale_image="true"
+                                 width="70" />
+                        <scroll_list
+                                 bottom_delta="-52"
+                                 can_resize="false"
+                                 column_padding="0"
+                                 draw_heading="false"
+                                 draw_stripes="false"
+                                 follows="left|top|right"
+                                 height="50"
+                                 halign="left"
+                                 left="80"
+                                 multi_select="false"
+                                 name="filter_list"
+                                 right="-90"
+                                 search_column="0"
+                                 sort_column="0">
+                                <column
+                                         halign="left"
+                                         label="Domain"
+                                         name="domain"
+                                         sort="domain"/>
+                        </scroll_list>
+                        <button
+                                 bottom_delta="0"
+                                 enabled="true"
+                                 follows="right|top"
+                                 font="SansSerifSmall"
+                                 halign="center"
+                                 height="16"
+                                 label="Remove"
+                                 label_selected="Remove"
+                                 right="-12"
+                                 mouse_opaque="true"
+                                 name="remove_navigate_filter"
+                                 scale_image="true"
+                                 width="70" />
+                </panel>
+                <panel
+                         border="true"
+                         follows="left|top|right|bottom"
+                         height="363"
+                         label="Audio"
+                         layout="topleft"
+                         left_delta="0"
+                         name="land_audio_panel"
+                         top_delta="1"
+                         width="458">
+                        <text
+                                 bottom="-45"
+                                 follows="left|top"
+                                 height="16"
+                                 layout="topleft"
+                                 left="10"
+                                 length="1"
+                                 name="MusicURL:"
+                                 type="string"
+                                 width="364">
                                Music URL:
                        </text>
-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+                        <line_editor
-                             enabled="true" follows="left|top" font="SansSerifSmall"
+                                 border_style="line"
-                             handle_edit_keys_directly="false" height="16" left="80" max_length="255"
+                                 border_thickness="1"
-                             mouse_opaque="true" name="music_url" right="-15"
+                                 bottom_delta="0"
-                             select_all_on_focus_received="true" select_on_focus="true"/>
+                                 follows="left|top|right"
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                                 height="16"
-                             bottom_delta="-40" drop_shadow_visible="true" enabled="true"
+                                 layout="topleft"
-                             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+                                 left="80"
-                             height="16" left="10" mouse_opaque="true" name="Sound:" v_pad="0"
+                                 max_length="255"
-                             width="364">
+                                 name="music_url"
+                                 right="-15"
+                                 select_on_focus="true" />
+                        <text
+                                 bottom_delta="-65"
+                                 follows="left|top"
+                                 height="16"
+                                 layout="topleft"
+                                 left="10"
+                                 length="1"
+                                 name="Sound:"
+                                 type="string"
+                                 width="364">
                                Sound:
                        </text>
-                        <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
+                        <check_box
-                             height="16" initial_value="false"
+                                 bottom_delta="0"
-                             label="Restrict gesture and object sounds to this parcel" left="80"
+                                 follows="left|top"
-                             mouse_opaque="true" name="check sound local" radio_style="false"
+                                 height="16"
-                             width="292" />
+                                 label="Restrict gesture and object sounds to this parcel"
-                        <button bottom_delta="0" enabled="true" follows="left|top" font="SansSerif"
+                                 layout="topleft"
-                             halign="center" height="18" label="?" label_selected="?" left="372"
+                                 left_delta="70"
-                             mouse_opaque="true" name="?" width="18" />
+                                 name="check_sound_local"
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                                 width="200" />
-                             bottom_delta="-40" enabled="true" follows="left|top" font="SansSerifSmall"
+                        <button
-                             h_pad="0" halign="left" height="16" left="10" mouse_opaque="false"
+                                 bottom_delta="0"
-                             name="Voice settings:" tab_stop="false" v_pad="0" width="364">
+                                 follows="left|top"
+                                 height="18"
+                                 label="?"
+                                 label_selected="?"
+                                 layout="topleft"
+                                 left_delta="292"
+                                 name="?"
+                                 width="18" />
+                        <text
+                                 bottom_delta="-65"
+                                 follows="left|top"
+                                 height="16"
+                                 layout="topleft"
+                                 left="10"
+                                 length="1"
+                                 mouse_opaque="false"
+                                 name="Voice:"
+                                 type="string"
+                                 width="364">
                                Voice:
                        </text>
-                        <check_box bottom_delta="-0" enabled="true" follows="left|top"
+                        <radio_group
-                             height="54" left="80" mouse_opaque="true" name="parcel_enable_voice_channel"
+                                 bottom_delta="-40"
-                             tab_stop="true" width="463"
+                                 draw_border="false"
-                             label="Enable Voice"
+                                 enabled="true"
-                        />
+                                 follows="left|top"
-                        <check_box bottom_delta="-0" enabled="false" follows="left|top"
+                                 height="60"
-                             height="54" left="80" mouse_opaque="true" name="parcel_enable_voice_channel_is_estate_disabled"
+                                 left="80"
-                             tab_stop="true" width="463"
+                                 mouse_opaque="true"
-                             label="Enable Voice (established by the Estate)"
+                                 name="parcel_voice_channel"
-                        />
+                                 tab_stop="true"
-                        <check_box bottom_delta="-20" enabled="true" follows="left|top"
+                                 width="219">
-                             height="54" left="100" mouse_opaque="true" name="parcel_enable_voice_channel_parcel"
+                                <radio_item
-                             tab_stop="true" width="443"
+                                         bottom="-19"
-                             label="Restrict Voice to this parcel"
+                                         enabled="true"
-                        />
+                                         follows="left|top"
+                                         height="16"
+                                         left="0"
+                                         length="1"
+                                         mouse_opaque="true"
+                                         name="Estate"
+                                         tool_tip="Use the estate voice channel."
+                                         type="string"
+                                         width="70">
+                                        Estate Channel
+                                </radio_item>
+                                <radio_item
+                                         bottom="-39"
+                                         enabled="true"
+                                         follows="left|top"
+                                         height="16"
+                                         left="0"
+                                         length="1"
+                                         mouse_opaque="true"
+                                         name="Parcel"
+                                         tool_tip="Restrict Voice to this parcel."
+                                         type="string"
+                                         width="70">
+                                        Parcel Channel
+                                </radio_item>
+                                <radio_item
+                                         bottom="-59"
+                                         enabled="true"
+                                         follows="left|top"
+                                         height="16"
+                                         left="0"
+                                         length="1"
+                                         mouse_opaque="true"
+                                         name="Disabled"
+                                         tool_tip="Disable voice on this parcel."
+                                         type="string"
+                                         width="70">
+                                        Disabled
+                                </radio_item>
+                        </radio_group>
                </panel>
                <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
                     height="333" label="Access" left="1" mouse_opaque="true"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml b/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
index 1a7bdb0..80a0468 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" height="556" min_height="556" min_width="300"
+     can_resize="false" height="556" min_height="256" min_width="300"
     name="Animation Preview" title="" width="300">
        <pad height="12" />
        <text follows="top|left" height="15" left="10" name="name_label">
@@ -13,7 +13,7 @@
                Description:
        </text>
        <line_editor bottom_delta="-2" follows="top|left|right" height="19" left="85"
-             max_length="254" name="description_form" right="-10" />
+             max_length="254" name="description_form" right="-10" spell_check="true" />
        <pad height="0" />
        <spinner decimal_digits="0" follows="left|top" height="18" increment="1" initial_val="0"
             label="Priority" label_width="50" left="10" max_val="4" min_val="0"
@@ -180,7 +180,7 @@
        <slider bottom_delta="0" follows="top|right" height="20" increment="0.0001"
             initial_val="0" label="" label_width="0" left="80" max_val="1" min_val="0"
             name="playback_slider" right="290" show_text="false" />
-        <text bottom="250" follows="top|left" left="10" name="bad_animation_text">
+        <text bottom="280" follows="top|left" left="20" name="bad_animation_text">
                Unable to read animation file.
 We recommend BVH files exported from Poser 4.
@@ -202,4 +202,7 @@ Maximum animation length is [MAX_LENGTH] seconds.
 [STATUS]
        </string>
+        <string name="in_world">
+                The animation preview is played on your avatar.
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_area_search.xml b/linden/indra/newview/skins/default/xui/en-us/floater_area_search.xml
index a3ec84f..9022c25 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_area_search.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_area_search.xml
@@ -15,7 +15,7 @@
        <line_editor name="Description query chunk" tool_tip=""
                bevel_style="in" border_style="line" border_thickness="1"
                height="20" width="200" left_delta="206" bottom_delta="0" follows="left|top"
-                font="SansSerifSmall" max_length="256" mouse_opaque="true" />
+                font="SansSerifSmall" max_length="256" mouse_opaque="true" spell_check="true" />
        <text name="owner_label" bottom_delta="-20" follows="top|left" height="15" left="12">
                Owner search string:
        </text>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_autocorrect.xml b/linden/indra/newview/skins/default/xui/en-us/floater_autocorrect.xml
new file mode 100644
index 0000000..d11b5ed
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_autocorrect.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater border="true" can_close="true" can_minimize="true" bottom="400" left="300" can_resize="false" height="430" width="400"
+ name="em_ac_floater" title="Autocorrect Settings">
+  <check_box bottom_delta="-50" left_delta="5" height="16" width="100" enabled="true" follows="left|top"
+                        font="SansSerifSmall" mouse_opaque="true" radio_style="false" label="Enable Autocorrect"
+                        control_name="EmeraldEnableAutoCorrect" name="em_ac_enable" tool_tip="You must have this check box enabled to use any of these settings,
+                        it will search your writable text entry, and replace any of the search entries with their replacement"/>
+  <button bottom_delta="-2" left_delta="150" height="22" width="80" enabled="true" follows="left|top"
+                        font="SansSerif" mouse_opaque="true" halign="center" scale_image="true"
+                        name="em_ac_loadlist" label="Load List.." tool_tip="Click this to load a previously exported list from a file"/>
+  <view_border bottom_delta="-10" left_delta="100" height="40" width="120" follows="left|top"
+                        bevel_style="in" mouse_opaque="false" name="em_ac_notecard_target"/>
+  <text bottom_delta="18" left_delta="0" height="16" width="120" follows="left|top" halign="center"
+      font="SansSerifSmall" mouse_opaque="true" name="em_ac_notecard"
+                                >
+    Drop a Notecard here
+    to load from it.
+  </text>
+  <view_border bottom="-70" left="2" height="0" width="396" follows="left|top"
+                        bevel_style="none" border_thickness="1" mouse_opaque="false" name="em_divisor1"/>
+  <text bottom_delta="-20" left_delta="0" height="16" width="400" follows="left|top" halign="center"
+                        font="SansSerifSmall" mouse_opaque="true" name="em_ac_text1"
+                        >List Name                                                         List Entries</text>
+  <scroll_list bottom_delta="-280" left_delta="0" height="280" width="199" follows="left|top"
+                        column_padding="0" draw_heading="true" multi_select="false"
+                        name="em_ac_list_name" search_column="1">
+  </scroll_list>
+  <scroll_list bottom_delta="100" left_delta="199" height="180" width="198" follows="left|top"
+                        column_padding="0" draw_heading="true" multi_select="false"
+                        name="em_ac_list_entry" search_column="1">
+  </scroll_list>
+  <view_border bottom_delta="-20" left_delta="10" height="16" width="180" follows="left|top"
+                        bevel_style="in" mouse_opaque="false" name="em_ac_box1"/>
+  <text bottom_delta="0" left_delta="0" height="16" width="180" follows="left|top" halign="center"
+      font="SansSerifSmall" mouse_opaque="true" name="em_ac_text_name"
+                                >List Name</text>
+  <text bottom_delta="-20" left_delta="-2" height="16" width="40" follows="left|top" halign="center"
+                        font="SansSerifSmall" mouse_opaque="true" name="em_ac_text2"
+                        >Author:</text>
+  <view_border bottom_delta="-0" left_delta="42" height="16" width="140" follows="left|top"
+                        bevel_style="in" mouse_opaque="false" name="em_ac_box2"/>
+  <text bottom_delta="0" left_delta="0" height="16" width="140" follows="left|top" halign="center"
+      font="SansSerifSmall" mouse_opaque="true" name="em_ac_text_author"
+                                >Author Name</text>
+  <check_box bottom_delta="-20" left_delta="-32" height="16" width="100" enabled="true" follows="left|top"
+                        font="SansSerifSmall" mouse_opaque="true" radio_style="false" label="Enabled, priority:"
+                        control_name="em_ac_enabled" name="em_ac_list_enabled" tool_tip="Whether or not you with to use this particular list"/>
+  <spinner bottom_delta="-0" left_delta="120" height="16" width="50" follows="left|top"
+      decimal_digits="0" increment="1" min_val="0" max_val="10" mouse_opaque="true"
+      label="" label_width="0" name="em_ac_priority" tool_tip="This number determine what order your list will be used to replace words.  A higher priority means it will be used before lower priority lists"/>
+  <check_box bottom_delta="-20" left_delta="-120" height="16" width="100" enabled="true" follows="left|top"
+                        font="SansSerifSmall" mouse_opaque="true" radio_style="false" label="Show Notifications"
+                        control_name="em_ac_list_show" name="em_ac_list_show" tool_tip="having this enabled will make a notification pop up every time a word is replaced"/>
+  <check_box bottom_delta="-20" left_delta="-0" height="16" width="100" enabled="true" follows="left|top"
+                        font="SansSerifSmall" mouse_opaque="true" radio_style="false" label="Word Style"
+                        control_name="em_ac_list_style" name="em_ac_list_style" tool_tip="having this checked means the list is for full words that should be replaced, unchecked means that it will look within words contents as well"/>
+  <view_border bottom="-405" left="201" height="40" width="0" follows="left|top"
+                        bevel_style="none" border_thickness="1" mouse_opaque="false" name="em_divisor2"/>
+  <view_border bottom_delta="-0" left="2" height="0" width="396" follows="left|top"
+                        bevel_style="none" border_thickness="1" mouse_opaque="false" name="em_divisor3"/>
+  <button bottom="-400" left="5" height="22" width="90" enabled="true" follows="left|top"
+                        font="SansSerif" mouse_opaque="true" halign="center" scale_image="true"
+                        name="em_ac_deletelist" label="Delete List" tool_tip="This will delete the entire list of words and their replacements, it is not undoable"/>
+  <button bottom_delta="-0" left_delta="95" height="22" width="90" enabled="true" follows="left|top"
+                        font="SansSerif" mouse_opaque="true" halign="center" scale_image="true"
+                        name="em_ac_exportlist" label="Export List" tool_tip="This will save your current list to a file so you can share it with your friends or edit it"/>
+  <button bottom_delta="0" left_delta="110" height="22" width="90" enabled="true" follows="left|top"
+                        font="SansSerif" mouse_opaque="true" halign="center" scale_image="true"
+                        name="em_ac_addentry" label="Add Entry"/>
+  <button bottom_delta="0" left_delta="95" height="22" width="90" enabled="true" follows="left|top"
+                        font="SansSerif" mouse_opaque="true" halign="center" scale_image="true"
+                        name="em_ac_rementry" label="Remove Entry"/>
+  <text bottom_delta="-25" left_delta="-240" height="16" width="170" follows="left|top" halign="center"
+                        font="SansSerifSmall" mouse_opaque="true" name="em_ac_text3"
+                        >Words automatically corrected:</text>
+  <view_border bottom_delta="-0" left_delta="180" height="16" width="70" follows="left|top"
+                        bevel_style="in" mouse_opaque="false" name="em_ac_statsbox"/>
+  <text bottom_delta="0" left_delta="0" height="16" width="70" follows="left|top" halign="center"
+      font="SansSerifSmall" mouse_opaque="true" name="em_ac_stats"
+                                >Count</text>
+</floater>
+\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml b/linden/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml
index 0e5a642..cd88c2e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml
@@ -58,7 +58,7 @@
           font="SansSerif" mouse_opaque="true" name="Refresh" scale_image="TRUE" />
      <slider bottom_delta="-20" left="10" follows="left|top" width="175" height="15"
           name="near_me_range" label="Range" control_name="NearMeRange" 
-           min_val="5" max_val="40" increment="1" initial_val="20" decimal_digits="0" />
+           min_val="5" max_val="512" increment="1" initial_val="20" decimal_digits="0" />
      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
           bottom_delta="0" left="185" drop_shadow_visible="true" follows="left|top"
           font="SansSerifSmall" h_pad="0" halign="left" height="15"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_busy.xml b/linden/indra/newview/skins/default/xui/en-us/floater_busy.xml
index 6d74882..50ec87c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_busy.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_busy.xml
@@ -61,7 +61,7 @@
  
  <text_editor type="string" length="1" bottom_delta="-85" embedded_items="false" enabled="true"
     follows="left|top" font="SansSerifSmall" height="75" left_delta="-15" max_length="1100"
-     mouse_opaque="true" name="im_response" width="245" word_wrap="true"/>
+     mouse_opaque="true" name="im_response" width="245" word_wrap="true" spell_check="true" />
  <check_box bottom_delta="-30" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
     initial_value="false" label="Send an item along with the response" left_delta="0"
@@ -93,4 +93,4 @@
  <button bottom_delta="0" follows="top|right" height="22" label="OK"
    right="-85" name="btn_ok" tool_tip="" enabled="true" width="80" />
  
-</floater>
-\ No newline at end of file
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
index 7cd895f..47638d5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
@@ -67,7 +67,7 @@
        <text_editor bottom_delta="-242" enabled="false"
             follows="top|right" font="SansSerifSmall" height="237" left="444"
             max_length="65535" name="covenant_editor" right="725"
-             width="271" word_wrap="true">
+             width="271" word_wrap="true" spell_check="true">
                Loading...
        </text_editor>
        <check_box follows="left|top" height="20" label="I Agree to the Covenant Defined Above."
@@ -117,7 +117,7 @@ sold with objects
        <icon follows="top|left" height="64" image_name="badge_ok.j2c" left="0" name="step_1"
             width="64" />
        <text bottom_delta="38" follows="top|left" height="16" left="72"
-             name="account_action" right="438" width="218" font="SansSerifBig" >
+             name="account_action" right="438" width="218" font="SansSerifLarge" >
                Upgrade you to premium membership.
        </text>
        <text follows="top|left" height="16" left="72" name="account_reason" right="400"
@@ -139,7 +139,7 @@ sold with objects
        <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
             name="step_2" width="64" />
        <text bottom_delta="38" follows="top|left" height="16" left="72"
-             name="land_use_action" right="438" width="218" font="SansSerifBig" >
+             name="land_use_action" right="438" width="218" font="SansSerifLarge" >
                Increase your monthly land use fees to US$ 40/month.
        </text>
        <text follows="top|left" height="32" left="72" name="land_use_reason" right="435"
@@ -151,7 +151,7 @@ This parcel is 512 sq.m. of land.
        <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
             name="step_3" width="64" />
        <text bottom_delta="38" follows="top|left" height="16" left="72"
-             name="purchase_action" right="438" font="SansSerifBig" >
+             name="purchase_action" right="438" font="SansSerifLarge" >
                Pay Joe Resident L$ 4000 for the land
        </text>
        <text follows="top|left" height="16" left="72" name="currency_reason" right="400">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
index 0d4eca4..e83a930 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
@@ -67,7 +67,7 @@
  <layout_stack border="false" bottom="2" follows="left|top|right|bottom" height="250" left="2"
             orientation="horizontal" width="430" name="panels">
-                <layout_panel border="false" bottom="0" default_tab_group="1" height="130" left="0"
+                <layout_panel border="false" bottom="0" default_tab_group="1" height="135" left="0"
                     min_width="275" name="im_contents_panel" width="305">
                        <combo_box follows="left|top" height="20" label="Gestures" left="5" name="Gesture"
                             width="120">
@@ -75,9 +75,12 @@
                                        Gestures
                                </combo_item>
                        </combo_box>
-                        <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
+                        <check_box bottom_delta="7" enabled="true" follows="left|top" font="SansSerifSmall"
                             height="20" initial_value="false" label="Show muted text" left_delta="125"
                             name="show mutes" radio_style="false" width="116" />
+                        <check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall"
+                             height="20" initial_value="false" label="Translate chat (powered by Google)" left_delta="0"
+                             name="translate chat" radio_style="false" width="100" />
                        <button name="toggle_active_speakers_btn"
                             label="&lt;&lt;" label_selected="&gt;&gt;" follows="right|top"
                             bottom_delta="0" left="262" right="305" height="20"
@@ -106,9 +109,9 @@
        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="0"
                                     enabled="true" follows="left|right|bottom" font="SansSerif"
                                     handle_edit_keys_directly="false" height="20" label="Click here to chat."
-                                     left="0" max_length="254" mouse_opaque="true" name="Chat Editor"
+                                     left="0" max_length="2147483647" mouse_opaque="true" name="Chat Editor"
                                     right="-70" select_all_on_focus_received="false" select_on_focus="false"
-                                     tab_group="1" />
+                                     tab_group="1" spell_check="true" />
                                <flyout_button bottom="0" follows="right|bottom" height="20" label="Say" left="-65"
                                     list_position="above" mouse_opaque="true" name="Say" tool_tip="(Enter)"
                                     width="70">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_command_line.xml b/linden/indra/newview/skins/default/xui/en-us/floater_command_line.xml
new file mode 100644
index 0000000..13b334b
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_command_line.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="busy" title="Chatbar Commands"
+         height="400" width="500"
+         follows="top|right" can_close="true" can_drag_on_left="false"
+         can_minimize="true" can_resize="false" can_tear_off="false">
+  <text bottom="-55" follows="left|top" font="SansSerifSmall" height="16" left="15"
+     name="loltxt2" width="512">        Teleport within sim (usage: cmd x y z)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+     font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+     tool_tip="" name="CmdLineChatbarPos" control_name="CmdLineChatbarPos" width="200"/>
+  <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+     name="loltxt3" width="512">        Teleport to ground (usage: cmd)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+     font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+     tool_tip="" name="CmdLineChatbarGround" control_name="CmdLineChatbarGround" width="200"/>
+  <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+     name="loltxt4" width="512">        Teleport to altitude (usage: cmd z)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+     font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+     tool_tip="" name="CmdLineChatbarHeight" control_name="CmdLineChatbarHeight" width="200"/>
+  <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+     name="loltxt5" width="512">        Teleport home (usage: cmd)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+     font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+     tool_tip="" name="CmdLineChatbarTeleportHome" control_name="CmdLineChatbarTeleportHome"
+     width="200"/>
+  <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+     name="loltxt6" width="512">        Rez a platform (usage: cmd 0 - 30)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+     font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+     tool_tip="" name="CmdLineChatbarRezPlatform" control_name="CmdLineChatbarRezPlatform"
+     width="200"/>
+  <slider bottom_delta="-20" left="20" name="CmdLineChatbarPlatformSize" control_name="CmdLineChatbarPlatformSize"
+     decimal_digits="1" enabled="true" follows="left|top" height="18" increment="0.5"
+     initial_val="5" label="Width" label_width="30" max_val="30" min_val="5"
+     mouse_opaque="true" show_text="true" width="200" auto_resize="false" tool_tip="How big do you want the platform to appear to be?"/>
+  <text bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16" left="15"
+     name="loltxt7" width="512">        Teleport to sim x (usage: cmd simname)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+     font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+     tool_tip="" name="CmdLineChatbarMapTo" control_name="CmdLineChatbarMapTo" width="200"/>
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+     initial_value="false" label="Use same position between sims" left_delta="0" mouse_opaque="true"
+     name="toggle" radio_style="false" width="270" control_name="CmdLineChatbarMapToKeepPos"/>
+  <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+     name="loltxt8" width="512">        Calc. expressions (usage: cmd SIN(2+2))</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+     font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+     tool_tip="" name="CmdLineChatbarCalc" control_name="CmdLineChatbarCalc" width="200"/>
+  <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" name="add_autokorrect"
+     width="512">Add autocorrect word(cmd list|bad|good)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+     font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+     tool_tip="" name="CmdLineChatbarAutocorrect" control_name="CmdLineChatbarAutocorrect" width="200"/>
+  <text bottom_delta="326" follows="left|top" font="SansSerifSmall" height="16" left_delta="230"
+     name="loltxt9" width="512">        Change Draw Distance (usage: cmd meters)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+     font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+     tool_tip="" name="CmdLineChatbarDrawDistance" control_name="CmdLineChatbarDrawDistance"
+     width="200"/>
+  <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+     name="loltxt10" width="512">        Teleport to cam position (usage: cmd)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+     font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+     tool_tip="" name="CmdLineChatbarTeleportToCam" control_name="CmdLineChatbarTeleportToCam"
+     width="200"/>
+  <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+     name="loltxt11" width="512">        Get avatar name from key (usage: cmd key)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+     font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+     tool_tip="" name="CmdLineChatbarKeyToName" control_name="CmdLineChatbarKeyToName"
+     width="200"/>
+  <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+     name="loltxt12" width="512">        Offer teleport to avatar (usage: cmd key)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+     font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+     tool_tip="" name="CmdLineChatbarOfferTp" control_name="CmdLineChatbarOfferTp" width="200"/>
+  <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+     name="loltxt13" width="512">        Teleport to avatar (usage: cmd name)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+     font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+     tool_tip="The syntax of this command allows partial names and is not case sensitive. Better results if used while the Radar is open."
+     name="CmdLineChatbarTP2" control_name="CmdLineChatbarTP2" width="200"/>
+  <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+     name="loltxt14" width="512">        Turn AO on/off (usage: cmd on/off)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+     font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+     tool_tip="" name="CmdLineChatbarAO" control_name="CmdLineChatbarAO" width="200"/>
+  <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+     name="loltxt15" width="512">        Clear the chat history (usage: cmd)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+     font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+     tool_tip="Clears the Chat History to prevent lag effects from chat spammers." name="CmdLineChatbarClearChat" control_name="CmdLineChatbarClearChat" width="200"/>
+  <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+        name="loltxt15" width="512">        Set the media url (usage: cmd url type)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+        tool_tip="Sets and plays your media stream to the entered url" name="CmdLineChatbarMedia" control_name="CmdLineChatbarMedia" width="200"/>
+  <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+        name="loltxt15" width="512">        Set the music stream url (usage: cmd url)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+        tool_tip="sets and plays your music stream to the entered url" name="CmdLineChatbarMusic" control_name="CmdLineChatbarMusic" width="200"/>
+  <button bottom="-40" follows="left|top" font="SansSerifSmall" height="18" label="?"
+        name="Help_CmdLine" tool_tip="Click here for help regarding the settings in this page."
+        right="-10" width="18"/>
+</floater>
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_dictionaries.xml b/linden/indra/newview/skins/default/xui/en-us/floater_dictionaries.xml
new file mode 100644
index 0000000..0aec715
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_dictionaries.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater border="false" can_close="true" can_minimize="true" bottom="500" left="500" can_resize="false" height="180" name="EmeraldIRC_dictionaries" title="Download new Dictionaries" width="300">
+     <text bottom="-50" follows="left|top" font="SansSerifSmall" height="20" left="15" name="EmDics_txt" width="300">
+Below is a list of additional dictionaries that can
+be downloaded from the Imprudence website.
+Please select the dictionary you wish to have available
+for install, and then press the download button.</text>
+        <combo_box allow_text_entry="false" bottom_delta="-85" left_delta="-10" follows="left|top" height="18"
+                max_chars="255" mouse_opaque="true" name="Emerald_combo_dics" width="290"
+                control_name="Emerald_combo_dics" tool_tip=""/>
+     <button bottom_delta="-35" enabled="true" follows="left|top" font="SansSerif"
+             halign="center" height="22" label="Download" left_delta="0"
+             mouse_opaque="true" name="Emerald_dic_download" scale_image="true" width="290" />
+</floater> 
+\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
index 3e300da..1ea4574 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
@@ -27,7 +27,7 @@
                        </text>
                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
                             follows="left|top" font="SansSerif" height="18" left_delta="38"
-                             max_length="63" mouse_opaque="true" name="name" width="128" />
+                             max_length="63" mouse_opaque="true" name="name" width="128" spell_check="true" />
                        <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
                             label="Search" label_selected="Search" left_delta="136" mouse_opaque="true"
                             name="Search" width="70" />
@@ -83,7 +83,7 @@
                             label="Search" left_delta="56" max_length="254" mouse_opaque="true"
                             name="search_editor" select_all_on_focus_received="false"
                             select_on_focus="false" tab_group="1" tool_tip="Search the web"
-                             width="160" />
+                             width="160" spell_check="true" />
                        <button bottom="-26" follows="top|right" font="SansSerifSmall" height="20" label="Back"
                             left="230" name="back_btn" width="70" />
                        <button bottom="-26" follows="top|right" font="SansSerifSmall" height="20"
@@ -159,7 +159,7 @@
                        </text>
                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
                             follows="left|right|top" font="SansSerif" height="18" left="56"
-                             max_length="63" mouse_opaque="true" name="name" width="160" />
+                             max_length="63" mouse_opaque="true" name="name" width="160" spell_check="true" />
                        <check_box bottom="-22" control_name="ShowPGClassifieds" follows="right|top"
                             font="SansSerifSmall" height="16" initial_value="true"
                             label="PG content" left="420" mouse_opaque="true"
@@ -253,7 +253,7 @@
                        </text>
                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
                             follows="left|right|top" font="SansSerif" height="18" left="56"
-                             max_length="63" mouse_opaque="true" name="event_search_text" width="160" />
+                             max_length="63" mouse_opaque="true" name="event_search_text" width="160" spell_check="true" />
                        <radio_group bottom="-40" draw_border="false" follows="right|top" height="40" left="560"
                             mouse_opaque="true" name="date_mode" width="300">
                                <radio_item bottom="-20" follows="left|top" height="20" left="0" mouse_opaque="true"
@@ -508,7 +508,7 @@ To buy direct, visit the land and click on the place name in the title bar.
                        </text>
                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
                             follows="left|right|top" font="SansSerif" height="18" left="56"
-                             max_length="63" mouse_opaque="true" name="name" width="160" />
+                             max_length="63" mouse_opaque="true" name="name" width="160" spell_check="true" />
                        <check_box bottom="-22" control_name="ShowPGSims" follows="right|top"
                             font="SansSerifSmall" height="16" initial_value="true"
                             label="PG content" left="420" mouse_opaque="true"
@@ -646,7 +646,7 @@ To buy direct, visit the land and click on the place name in the title bar.
      </text>
          <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
                             follows="left|right|top" font="SansSerif" height="18" left="56"
-                             max_length="63" mouse_opaque="true" name="name" width="160" />
+                             max_length="63" mouse_opaque="true" name="name" width="160" spell_check="true" />
                <button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
                             label="Search" label_selected="Search" left="121" mouse_opaque="true"
                             name="Search" width="95" />
@@ -694,7 +694,7 @@ To buy direct, visit the land and click on the place name in the title bar.
                        </text>
                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
                             follows="left|top" font="SansSerif" height="18" left_delta="38"
-                             max_length="63" mouse_opaque="true" name="name" width="200" />
+                             max_length="63" mouse_opaque="true" name="name" width="200" spell_check="true" />
                        <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
                             label="Search" label_selected="Search" left_delta="210" mouse_opaque="true"
                             name="Search" width="70" />
@@ -726,6 +726,10 @@ To buy direct, visit the land and click on the place name in the title bar.
                             mouse_opaque="true" name="result_text" v_pad="0" width="328" />
                </panel>
        </tab_container>
+  <check_box name="save_results_check" label="Save search results"
+       bottom="-37" right="-80"  height="16" width="80"
+       follows="right|top" font="SansSerifSmall" control_name="SaveSearchResults"
+       initial_value="false" mouse_opaque="true" />
        <panel bottom="-580" follows="right|top" height="490" left="340"
             name="classified_details_panel" width="440" />
        <panel bottom="-580" follows="right|top" height="506" left="350" name="Panel Avatar"
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_env_settings.xml b/linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml
index e2bafbf..0a4f2a9 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml
@@ -58,9 +58,11 @@
        <button bottom="-140" follows="left|top" font="SansSerifSmall" height="20"
             label="Use Estate Time" left="8" name="EnvUseEstateTimeButton" width="137" />
        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20"
-             label="Advanced Sky" left="154" name="EnvAdvancedSkyButton" width="137" />
+             label="Advanced Sky" left="154" name="EnvAdvancedSkyButton" width="107" />
-        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20"
+  <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20"
-             label="Advanced Water" left="300" name="EnvAdvancedWaterButton" width="137" />
+             label="Advanced Water" left="270" name="EnvAdvancedWaterButton" width="137" />
-        <button bottom="-40" follows="left|top" font="SansSerif" height="18" label="?"
+  <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20"
+             label="Advanced WindLight Manager" left="416" name="EnvWLManager" width="177" />
+  <button bottom="-40" follows="left|top" font="SansSerif" height="18" label="?"
             left="570" name="EnvSettingsHelpButton" width="22" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_god_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_god_tools.xml
index ee70387..9ce4b54 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_god_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_god_tools.xml
@@ -133,7 +133,7 @@
                             bottom="-146" drop_shadow_visible="true" follows="left|top"
                             font="SansSerif" h_pad="0" halign="left" height="16" left_delta="-108"
                             mouse_opaque="true" name="land cost text" v_pad="0" width="110">
-                                L$ per sq. meter:
+                                 [CURRENCY] per sq. meter:
                        </text>
                        <button bottom="-170" follows="top|right" font="SansSerifSmall" halign="center"
                             height="20" label="Refresh" label_selected="Refresh" left="278"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_grid_default_selector.xml b/linden/indra/newview/skins/default/xui/en-us/floater_grid_default_selector.xml
index 3c26d30..51ba35f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_grid_default_selector.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_grid_default_selector.xml
@@ -7,13 +7,14 @@
    Or use the Grid Manager to add a new one
  </text>
  <scroll_list background_visible="true" bottom_delta="30" draw_border="true"
-      draw_stripes="false" sort_column="0"
+      draw_stripes="false" sort_column="1"
      follows="top|left|bottom" height="280" left="10" multi_select="false"
      name="grid_list" width="240">
-    <column label="" name="grid" width="230" />
+    <column label="" name="grid_nick" width="0" />
+    <column label="" name="grid_name" width="230" />
  </scroll_list>
  <button bottom="5" follows="bottom|right" height="20" label="Cancel"
      right="-5" name="btn_cancel" width="85" />
  <button bottom_delta="0" follows="bottom|right" height="20" label="OK"
            left_delta="-90" name="btn_ok" width="85" />
-</floater>
-\ No newline at end of file
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_grid_manager.xml b/linden/indra/newview/skins/default/xui/en-us/floater_grid_manager.xml
index f635d59..bc07373 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_grid_manager.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_grid_manager.xml
@@ -1,90 +1,112 @@
 <?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="400" min_height="400" min_width="600"
+     can_resize="true" height="420" min_height="420" min_width="600"
     name="floater_login" title="Grid Manager" width="600">
-  <!-- Grid Selector -->
+  <!-- GRID LIST -->
+  
  <text type="string" length="1" enabled="true" name="grid_selector_label"
-                height="16" width="100" left="10" top="-18"
+                  height="16" width="100" left="10" top="-18"
-                h_pad="0" v_pad="0" halign="left"
+                  h_pad="0" v_pad="0" halign="left"
-                font="SansSerif"
+                  font="SansSerif"
-                follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
+                  follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
            drop_shadow_visible="true" border_drop_shadow_visible="false">
    Select a Grid:
  </text>
  
  <scroll_list background_visible="true" bottom_delta="65" draw_border="true"
-             draw_stripes="false" sort_column="0"
+             draw_stripes="false" sort_column="1"
-             follows="top|left|bottom" height="300" left="10" multi_select="false"
+             follows="top|left|bottom" height="320" left="10" multi_select="false"
-             name="grid_selector" width="170">
+             name="grid_selector" width="200">
-    <column label="Grid List" name="grid" width="170" />
+    <column label="Grid List" name="grid_nick" width="0" />
+    <column label="Grid List" name="grid_name" width="200" />
  </scroll_list>
  
-  <!-- Grid Selector Buttons -->
+  <!-- GRID BUTTONS -->
+  
  <button label="Add New Grid" enabled="true" name="btn_add"
-                height="18" width="150" left="10" bottom_delta="-22"
+                  height="18" width="150" left="35" bottom_delta="-22"
-                halign="center"
+                  halign="center"
-                follows="left|bottom" scale_image="true"
+                  follows="left|bottom" scale_image="true"
            font="SansSerifSmall" mouse_opaque="true" />
  <button label="Duplicate Grid" enabled="true" name="btn_copy"
-                height="18" width="150" left_delta="0" bottom_delta="-20"
+                  height="18" width="150" left_delta="0" bottom_delta="-20"
-                halign="center"
+                  halign="center"
-                follows="left|bottom" scale_image="true"
+                  follows="left|bottom" scale_image="true"
            font="SansSerifSmall" mouse_opaque="true" />
  <button label="Delete Grid" enabled="true" name="btn_delete"
-                height="18" width="150" left_delta="0" bottom_delta="-20"
+                  height="18" width="150" left_delta="0" bottom_delta="-20"
-                halign="center"
+                  halign="center"
-                follows="left|bottom" scale_image="true"
+                  follows="left|bottom" scale_image="true"
            font="SansSerifSmall" mouse_opaque="true" />
-  <!-- Grid Details -->
+  <!-- GRID NAME AND NICK -->
+  
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom="365" drop_shadow_visible="true" follows="left|top"
+       font="SansSerif" h_pad="0" halign="left" height="16"
+       left="220" mouse_opaque="true" name="gridnick_text" v_pad="0" width="120">
+    Grid nick (unique):
+  </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0" 
+             follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
+             height="20" max_height="20" left_delta="110" max_length="40" mouse_opaque="true"
+             name="gridnick" select_all_on_focus_received="true" width="260" label="required" />
  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-     top="-45" drop_shadow_visible="true" follows="left|top"
+       bottom_delta="-23" drop_shadow_visible="true" follows="left|top"
-     font="SansSerif" h_pad="0" halign="left" height="16"
+       font="SansSerif" h_pad="0" halign="left" height="16"
-     left="195" mouse_opaque="true" name="gridnick_text" v_pad="0" width="120">
+       left="220" mouse_opaque="true" name="gridname_text" v_pad="0" width="120">
    Grid name:
  </text>
-  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="335" 
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-             follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
+             follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
-             height="20" max_height="20" left_delta="90" max_length="40" mouse_opaque="true"
+             height="20" max_height="20" left_delta="110" max_length="40" mouse_opaque="true"
-             name="gridnick" select_all_on_focus_received="true" width="300" />
+             name="gridname" select_all_on_focus_received="true" width="260" label="required" />
-  <!--
+  <!-- NAME AND PASSWORD -->
+  
  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-23" drop_shadow_visible="true" follows="left|top"
+             bottom="315" drop_shadow_visible="true" follows="left|top"
             font="SansSerif" h_pad="0" halign="left" height="16"
-             left_delta="-90" mouse_opaque="true" name="first_name_text" v_pad="0" width="100">
+             left="220" mouse_opaque="true" name="first_name_text" v_pad="0" width="100">
-                First Name:
+    First Name:
-        </text>
+  </text>
  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-   follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
+       follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
-   height="20" left_delta="90" max_length="45" mouse_opaque="true"
+       height="20" left_delta="110" max_length="45" mouse_opaque="true"
-   name="first_name" select_all_on_focus_received="true" width="200" />
+       name="first_name" select_all_on_focus_received="true" width="200" />
  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-23" drop_shadow_visible="true" follows="left|top"
+       bottom_delta="-23" drop_shadow_visible="true" follows="left|top"
+       font="SansSerif" h_pad="0" halign="left" height="16"
+       left_delta="-110" mouse_opaque="true" name="username_text" v_pad="0" width="100">
+    Username:
+  </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+       follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
+       height="20" left_delta="110" max_length="45" mouse_opaque="true"
+       name="username" select_all_on_focus_received="true" width="200" />
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
             font="SansSerif" h_pad="0" halign="left" height="16"
-             left_delta="-90" mouse_opaque="true" name="last_name_text" v_pad="0" width="100">
+             left_delta="-110" mouse_opaque="true" name="last_name_text" v_pad="0" width="100">
    Last Name:
  </text>
  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-   follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
+       follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
-   height="20" left_delta="90" max_length="45" mouse_opaque="true"
+       height="20" left_delta="110" max_length="45" mouse_opaque="true"
-   name="last_name" select_all_on_focus_received="true" width="200" />
+       name="last_name" select_all_on_focus_received="true" width="200" />
  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom_delta="-23" drop_shadow_visible="true" follows="left|top"
             font="SansSerif" h_pad="0" halign="left" height="16"
-             left_delta="-90" mouse_opaque="true" name="avatar_password_text" v_pad="0" width="120">
+             left_delta="-110" mouse_opaque="true" name="avatar_password_text" v_pad="0" width="120">
-                Password:
+    Password:
-        </text>
+  </text>
-        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
             follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
-             height="20" left_delta="90" max_length="16" mouse_opaque="true"
+             height="20" left_delta="110" max_length="16" mouse_opaque="true"
             name="avatar_password" select_all_on_focus_received="true" width="200" />
-  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <!--<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
             font="SansSerif" h_pad="0" halign="left" height="16"
             left_delta="-90" mouse_opaque="true" name="start_location_text" v_pad="0"
@@ -105,112 +127,110 @@
    </combo_item>
  </combo_box>
  -->
+  
+  <!-- LOGIN URI STUFF -->
  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
        bottom_delta="-30" drop_shadow_visible="true" follows="left|top"
        font="SansSerif" h_pad="0" halign="left" height="16"
-        left_delta="-90" mouse_opaque="true" name="loginuri_text" v_pad="0" width="120">
+        left_delta="-110" mouse_opaque="true" name="loginuri_text" v_pad="0" width="120">
    Login URI:
  </text>
  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
              follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
-              height="20" left_delta="90" max_length="255" mouse_opaque="true"
+              height="20" left_delta="110" max_length="255" mouse_opaque="true"
-              name="loginuri" select_all_on_focus_received="true" width="300" />
+              name="loginuri" select_all_on_focus_received="true" width="260" label="required" />
  <button label="Get Grid Info" enabled="true" name="btn_gridinfo"
-        height="18" width="100" bottom_delta="-25" left_delta="0" 
+        height="18" width="100" bottom_delta="-38" left_delta="0" 
        halign="center" follows="left|top" scale_image="true"
        font="SansSerifSmall" mouse_opaque="true" />
  <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
        height="18" label="Clear Info" left_delta="104"
        mouse_opaque="true" name="btn_clear" scale_image="true" width="100" />
+  <!-- LOGIN URI RETURN URLS-->
+  
  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-      bottom_delta="-30" drop_shadow_visible="true" follows="left|top"
+       bottom_delta="-25" drop_shadow_visible="true" follows="left|top"
-      font="SansSerif" h_pad="0" halign="left" height="16"
+       font="SansSerifSmall" h_pad="0" halign="left" height="16"
-      left="195" mouse_opaque="true" name="loginpage_text" v_pad="0" width="120">
+       left="230" mouse_opaque="true" name="loginpage_text" v_pad="0" width="120">
-    Grid Info URLs:
-  </text>
-  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-     bottom_delta="-28" drop_shadow_visible="true" follows="left|top"
-     font="SansSerifSmall" h_pad="0" halign="left" height="16"
-     left="205" mouse_opaque="true" name="loginpage_text" v_pad="0" width="120">
    Login page:
  </text>
  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
             follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
-             height="20" left_delta="90" max_length="255" mouse_opaque="true"
+             height="20" left_delta="100" max_length="255" mouse_opaque="true"
-             name="loginpage" select_all_on_focus_received="true" width="280" />
+             name="loginpage" select_all_on_focus_received="true" width="250" />
  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-     bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
+       bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
-     font="SansSerifSmall" h_pad="0" halign="left" height="16"
+       font="SansSerifSmall" h_pad="0" halign="left" height="16"
-     left_delta="-90" mouse_opaque="true" name="helperuri_text" v_pad="0" width="120">
+       left_delta="-100" mouse_opaque="true" name="helperuri_text" v_pad="0" width="120">
    Helper URI:
  </text>
  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
             follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
-             height="20" left_delta="90" max_length="255" mouse_opaque="true"
+             height="20" left_delta="100" max_length="255" mouse_opaque="true"
-             name="helperuri" select_all_on_focus_received="true" width="280" />
+             name="helperuri" select_all_on_focus_received="true" width="250" />
  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-   bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
+       bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
-   font="SansSerifSmall" h_pad="0" halign="left" height="16"
+       font="SansSerifSmall" h_pad="0" halign="left" height="16"
-   left_delta="-90" mouse_opaque="true" name="website_text" v_pad="0" width="120">
+       left_delta="-100" mouse_opaque="true" name="website_text" v_pad="0" width="120">
    Website:
  </text>
  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
             follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
-             height="20" left_delta="90" max_length="255" mouse_opaque="true"
+             height="20" left_delta="100" max_length="255" mouse_opaque="true"
-             name="website" select_all_on_focus_received="true" width="280" />
+             name="website" select_all_on_focus_received="true" width="250" />
  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-   bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
+       bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
-   font="SansSerifSmall" h_pad="0" halign="left" height="16"
+       font="SansSerifSmall" h_pad="0" halign="left" height="16"
-   left_delta="-90" mouse_opaque="true" name="support_text" v_pad="0" width="120">
+       left_delta="-100" mouse_opaque="true" name="support_text" v_pad="0" width="120">
    Support:
  </text>
  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
             follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
-             height="20" left_delta="90" max_length="255" mouse_opaque="true"
+             height="20" left_delta="100" max_length="255" mouse_opaque="true"
-             name="support" select_all_on_focus_received="true" width="280" />
+             name="support" select_all_on_focus_received="true" width="250" />
  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-   bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
+       bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
-   font="SansSerifSmall" h_pad="0" halign="left" height="16"
+       font="SansSerifSmall" h_pad="0" halign="left" height="16"
-   left_delta="-90" mouse_opaque="true" name="register_text" v_pad="0" width="120">
+       left_delta="-100" mouse_opaque="true" name="register_text" v_pad="0" width="120">
    Account:
  </text>
  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
             follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
-             height="20" left_delta="90" max_length="255" mouse_opaque="true"
+             height="20" left_delta="100" max_length="255" mouse_opaque="true"
-             name="register" select_all_on_focus_received="true" width="280" />
+             name="register" select_all_on_focus_received="true" width="250" />
  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-   bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
+       bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
-   font="SansSerifSmall" h_pad="0" halign="left" height="16"
+       font="SansSerifSmall" h_pad="0" halign="left" height="16"
-   left_delta="-90" mouse_opaque="true" name="password_text" v_pad="0" width="120">
+       left_delta="-100" mouse_opaque="true" name="password_text" v_pad="0" width="120">
    Password:
  </text>
  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
             follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
-             height="20" left_delta="90" max_length="255" mouse_opaque="true"
+             height="20" left_delta="100" max_length="255" mouse_opaque="true"
-             name="password" select_all_on_focus_received="true" width="280" />
+             name="password" select_all_on_focus_received="true" width="250" />
  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-   bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
+       bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
-   font="SansSerifSmall" h_pad="0" halign="left" height="16"
+       font="SansSerifSmall" h_pad="0" halign="left" height="16"
-   left_delta="-90" mouse_opaque="true" name="websearch_text" v_pad="0" width="120">
+       left_delta="-100" mouse_opaque="true" name="search_text" v_pad="0" width="120">
    Web Search:
  </text>
  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
             follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
-             height="20" left_delta="90" max_length="255" mouse_opaque="true"
+             height="20" left_delta="100" max_length="255" mouse_opaque="true"
-             name="search" select_all_on_focus_received="true" width="280" />
+             name="search" select_all_on_focus_received="true" width="250" />
  <view_border bevel_style="none" border_thickness="1" bottom_delta="-10" 
-               follows="top|left|right" height="168" left="195" 
+       follows="top|left|right" height="193" left="220" 
-               name="OptionalPrefsBorder" width="390" />
+       name="OptionalPrefsBorder" width="370" />
  <!-- Combo box for multi avatar grid manager avatar name
        <combo_box allow_text_entry="true" bevel_style="in" border_style="line" border_thickness="1"
@@ -236,39 +256,32 @@
             initial_value="false" label="Global Avatar"
             left_delta="0" mouse_opaque="true" name="global_check" width="138" />
-  <check_box bottom="10" follows="left|bottom" font="SansSerifSmall" height="16"
+  <check_box bottom="10" follows="left|top" font="SansSerifSmall" height="16"
             initial_value="false" label="Remember password"
             left_delta="165" mouse_opaque="true" name="remember_check" width="138" />
  
-  <check_box bottom="10" follows="left|bottom" font="SansSerifSmall" height="16"
+  <check_box bottom="10" follows="left|top" font="SansSerifSmall" height="16"
     initial_value="false" label="secret level"
     left_delta="165" mouse_opaque="true" name="gawd_mode" width="138" />
  -->
  <!-- Cancel/Connect Buttons -->
-  <!--
-  <button bottom="-44" follows="right|top" font="SansSerif" halign="center"
-             height="24" label="Set as Default" label_selected="Set as Default"
-             left="470" mouse_opaque="true" name="set_default" scale_image="TRUE"
-             width="110" />
-  -->
  <!-- <button bottom="28" follows="right|bottom" font="SansSerif" halign="center"
             height="24" label="Connect" label_selected="Connect"
             left="280" mouse_opaque="true" name="connect_btn" scale_image="TRUE"
             width="100" />  -->
  <button bottom="2" follows="right|bottom" font="SansSerif" halign="center"
-     height="24" label="Apply" label_selected="Apply" left="-108"
+       height="24" label="Apply" label_selected="Apply" left="-108"
-     mouse_opaque="true" name="btn_apply" scale_image="TRUE" width="100" />
+       mouse_opaque="true" name="btn_apply" scale_image="TRUE" width="100" />
  <button bottom="2" follows="right|bottom" font="SansSerif" halign="center"
-     height="24" label="Cancel" label_selected="Cancel" left_delta="-104"
+       height="24" label="Cancel" label_selected="Cancel" left_delta="-104"
-     mouse_opaque="true" name="btn_cancel" scale_image="TRUE" width="100" />
+       mouse_opaque="true" name="btn_cancel" scale_image="TRUE" width="100" />
  <button bottom="2" follows="right|bottom" font="SansSerif" halign="center"
-     height="24" label="OK" label_selected="OK" left_delta="-104"
+       height="24" label="OK" label_selected="OK" left_delta="-104"
-     mouse_opaque="true" name="btn_ok" scale_image="TRUE" width="100" />
+       mouse_opaque="true" name="btn_ok" scale_image="TRUE" width="100" />
  <!--
-        <combo_box allow_text_entry="true" bottom="32" follows="left|bottom" height="18"
+        <combo_box allow_text_entry="true" bottom="32" follows="left|top" height="18"
             left_delta="135" max_chars="40" mouse_opaque="true"
             name="server_combo" width="200" />
  -->
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_group_info.xml b/linden/indra/newview/skins/default/xui/en-us/floater_group_info.xml
deleted file mode 100644
index d0e11d6..0000000
--- a/linden/indra/newview/skins/default/xui/en-us/floater_group_info.xml
+++ /dev/null
@@ -1,657 +0,0 @@
-<?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="360" min_height="100" min_width="100"
-     name="groupinfo" title="The Lindens - Group Information" width="458">
-        <tab_container bottom="-330" height="306" left="0" mouse_opaque="false" name="tab"
-             tab_position="top" width="458">
-                <panel bottom="-305" follows="left|top|right|bottom" height="289" label="General"
-                     left="1" mouse_opaque="true" name="gen" width="456">
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-                             h_pad="0" halign="left" height="16" left="12" mouse_opaque="true"
-                             name="title_box" v_pad="0" width="436">
-                                Group Info
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
-                             mouse_opaque="true" name="txt" v_pad="0" width="436">
-                                Groups are a fun way to collaborate with your friends.
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
-                             mouse_opaque="true" name="txt2" v_pad="0" width="436">
-                                Groups let you have titles and insignia and vote.
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
-                             mouse_opaque="true" name="txt3" v_pad="0" width="436">
-                                Anyone may create a group. Each person may belong to up to 15 groups.
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
-                             mouse_opaque="true" name="txt4" v_pad="0" width="436">
-                                Groups must have at least 3 members to stay active.
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
-                             mouse_opaque="true" name="group_create_text" v_pad="0" width="436">
-                                Creating a group costs L$100.
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-32" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="12"
-                             mouse_opaque="true" name="lbl" v_pad="0" width="70">
-                                Name:
-                        </text>
-                        <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
-                             border_thickness="1" bottom="-138" follows="left|top" font="SansSerifSmall"
-                             height="16" left_delta="75" max_length="35" mouse_opaque="true" name="name"
-                             text_readonly_color="1, 1, 1, 1" width="361" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-156" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="12"
-                             mouse_opaque="true" name="founder_label" v_pad="0" width="70">
-                                Founder:
-                        </text>
-                        <name_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
-                             border_thickness="1" bottom="-156" follows="left|top" font="SansSerifSmall"
-                             height="16" left_delta="75" max_length="35" mouse_opaque="true"
-                             name="founder" text_readonly_color="1, 1, 1, 1" width="361" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-174" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="12"
-                             mouse_opaque="true" name="lbl2" v_pad="0" width="70">
-                                Charter:
-                        </text>
-                        <text_editor bg_readonly_color="0, 0, 0, 0" bottom="-206" embedded_items="false"
-                             follows="left|top" font="SansSerifSmall" height="48" left="87"
-                             max_length="511" mouse_opaque="true" name="charter"
-                             text_readonly_color="1, 1, 1, 1" width="361" word_wrap="true" />
-                        <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="true" label="Show In Group List" left="87"
-                             mouse_opaque="true" name="sho" radio_style="false" width="361" />
-                        <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Show Members In Group List" left="87"
-                             mouse_opaque="true" name="sho_mem" radio_style="false" width="361" />
-                        <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Publish on the web." left="87"
-                             mouse_opaque="true" name="allow_publish" radio_style="false"
-                             tool_tip="Publish your profile information on the web." width="361" />
-                        <button bottom="-260" follows="left|top" font="SansSerif" halign="center" height="16"
-                             label="?" label_selected="?" left_delta="130" mouse_opaque="true"
-                             name="publish_help_btn" width="20" />
-                        <check_box bottom="-278" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Mature" left="87" mouse_opaque="true"
-                             name="mature" radio_style="false"
-                             tool_tip="Your profile information is considered mature." width="361" />
-                </panel>
-                <panel bottom="-305" follows="left|top|right|bottom" height="289" label="Titles"
-                     left="1" mouse_opaque="true" name="tit" width="456">
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-                             h_pad="0" halign="left" height="16" left="12" mouse_opaque="true"
-                             name="txt" v_pad="0" width="436">
-                                Group Titles
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
-                             mouse_opaque="true" name="txt2" v_pad="0" width="436">
-                                Groups can have officers and members, both of whom can have special titles.
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
-                             mouse_opaque="true" name="txt3" v_pad="0" width="436">
-                                These titles appear before their names in the world, in chat, and in IM.
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-32" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="12"
-                             mouse_opaque="true" name="lbl" v_pad="0" width="70">
-                                Officer Title:
-                        </text>
-                        <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
-                             border_thickness="1" bottom="-90" follows="left|top" font="SansSerifSmall"
-                             height="16" left_delta="75" max_length="20" mouse_opaque="true" name="ohon"
-                             text_readonly_color="1, 1, 1, 1" width="105" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-90" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left_delta="110"
-                             mouse_opaque="true" name="lbl2" v_pad="0" width="70">
-                                Member Title:
-                        </text>
-                        <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
-                             border_thickness="1" bottom="-90" follows="left|top" font="SansSerifSmall"
-                             height="16" left_delta="75" max_length="20" mouse_opaque="true" name="mhon"
-                             text_readonly_color="1, 1, 1, 1" width="105" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-124" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
-                             mouse_opaque="true" name="lbl3" v_pad="0" width="436">
-                                Drag a texture out of your inventory to set the group&apos;s insignia.
-                        </text>
-                        <texture_picker bottom="-220" follows="left|top" height="80" left="87" mouse_opaque="true"
-                             name="insig" tool_tip="Click to choose a picture" width="64" />
-                </panel>
-                <panel bottom="-305" follows="left|top|right|bottom" height="289" label="Members"
-                     left="1" mouse_opaque="true" name="mem" width="456">
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-                             h_pad="0" halign="left" height="16" left="12" mouse_opaque="true"
-                             name="txt" v_pad="0" width="436">
-                                Group Members
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
-                             mouse_opaque="true" name="txt2" v_pad="0" width="436">
-                                Current Group officers and members.
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
-                             mouse_opaque="true" name="txt3" v_pad="0" width="436">
-                                Click on a name to view to the member&apos;s profile.
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="12"
-                             mouse_opaque="true" name="lbl" v_pad="0" width="70">
-                                Officers:
-                        </text>
-                        <name_list allow_calling_card_drop="false" background_visible="false"
-                             bg_selected_color="0.243137, 0.243137, 0.243137, 1" bottom="-132"
-                             column_padding="0" draw_border="true" fg_disable_color="1, 1, 1, 1"
-                             fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
-                             follows="left|top" height="72" left="87" mouse_opaque="true"
-                             multi_select="false" name="officers" width="361" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-150" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="12"
-                             mouse_opaque="true" name="members_label" v_pad="0" width="70">
-                                Members:
-                        </text>
-                        <name_list allow_calling_card_drop="false" background_visible="false" bottom="-254"
-                             column_padding="0" draw_border="true" fg_disable_color="1, 1, 1, 1"
-                             fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
-                             follows="left|top" height="120" left="87" mouse_opaque="true"
-                             multi_select="false" name="members" width="361" />
-                        <button bottom_delta="-27" follows="left|bottom" font="SansSerif" halign="center"
-                             height="20" label="Eject Member" label_selected="Eject Member" left="87"
-                             mouse_opaque="true" name="eject_member_btn" width="120" />
-                </panel>
-                <panel bottom="-305" follows="left|top|right|bottom" height="289" label="Voting"
-                     left="1" mouse_opaque="true" name="voting" width="456">
-                        <tab_container bottom="-289" height="285" left="30" mouse_opaque="false" name="tab"
-                             tab_position="top" width="400">
-                                <panel bottom="-284" follows="left|top|right|bottom" height="268" label="Election"
-                                     left="1" mouse_opaque="true" name="recall" width="398">
-                                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                                             bottom="-18" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-                                             h_pad="0" halign="left" height="10" left="12" mouse_opaque="false"
-                                             name="txt" v_pad="0" width="363">
-                                                Group Election
-                                        </text>
-                                        <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="12"
-                                             mouse_opaque="false" name="instructions" v_pad="0" width="350">
-                                                Press the Start Election button to start a new election. 
-The candidates will include all non-officer group members.
-                                        </text>
-                                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                                             bottom_delta="-26" drop_shadow_visible="true" follows="left|top"
-                                             font="SansSerifSmall" h_pad="0" halign="right" height="10" left="12"
-                                             mouse_opaque="false" name="lbl" v_pad="0" width="70">
-                                                Candidates:
-                                        </text>
-                                        <name_list allow_calling_card_drop="false" background_visible="false"
-                                             bg_selected_color="0.243137, 0.243137, 0.243137, 1" bottom="-150"
-                                             column_padding="0" draw_border="true" fg_disable_color="1, 1, 1, 1"
-                                             fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
-                                             follows="left|top" height="94" left="87" mouse_opaque="true"
-                                             multi_select="false" name="candidates" width="290" />
-                                        <button bottom_delta="-116" follows="top" font="SansSerif" halign="center" height="20"
-                                             label="Vote" label_selected="Vote" left="87" mouse_opaque="true"
-                                             name="btn_vote" width="60" />
-                                        <button bottom="-266" follows="left|top" font="SansSerif" halign="center" height="20"
-                                             label="Abstain" label_selected="Abstain" left_delta="68"
-                                             mouse_opaque="true" name="btn_abstain" width="60" />
-                                        <button bottom="-260" follows="top|right" font="SansSerif" halign="center" height="20"
-                                             label="Start Election" label_selected="Start Election" left="218"
-                                             mouse_opaque="true" name="btn_start_election" width="160" />
-                                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                                             bottom="-172" drop_shadow_visible="true" follows="left|top"
-                                             font="SansSerifSmall" h_pad="0" halign="right" height="20" left="12"
-                                             mouse_opaque="false" name="lbl2" v_pad="0" width="70">
-                                                Quorum:
-                                        </text>
-                                        <spinner bottom="-172" decimal_digits="0" follows="left|top" height="20" increment="1"
-                                             initial_val="1" left_delta="75" max_val="111" min_val="1"
-                                             mouse_opaque="true" name="quorum"
-                                             tool_tip="# of total voting members needed for election results to be binding."
-                                             width="40" />
-                                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                                             bottom="-172" drop_shadow_visible="true" follows="left|top"
-                                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left_delta="45"
-                                             mouse_opaque="false" name="quorum_text" v_pad="0" width="300">
-                                                out of 111 total group members.
-                                        </text>
-                                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                                             bottom="-196" drop_shadow_visible="true" follows="left|top"
-                                             font="SansSerifSmall" h_pad="0" halign="right" height="20" left="210"
-                                             mouse_opaque="false" name="lbl3" v_pad="0" width="65">
-                                                Majority:
-                                        </text>
-                                        <radio_group bottom="-232" follows="left|top" height="60" left="270" mouse_opaque="true"
-                                             name="majority" tool_tip="Majority of total votes needed to win."
-                                             width="105">
-                                                <radio_item bottom="-19" follows="left|top" height="15" left="4" mouse_opaque="true"
-                                                     name="radio" width="99">
-                                                        Simple Majority
-                                                </radio_item>
-                                                <radio_item bottom_delta="-19" follows="left|top" height="15" left="4" mouse_opaque="true"
-                                                     name="radio2" width="93">
-                                                        2/3 Majority
-                                                </radio_item>
-                                                <radio_item bottom_delta="-19" follows="left|top" height="15" left="4" mouse_opaque="true"
-                                                     name="radio3" width="93">
-                                                        Unanimous
-                                                </radio_item>
-                                        </radio_group>
-                                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                                             bottom="-203" drop_shadow_visible="true" follows="left|top"
-                                             font="SansSerifSmall" h_pad="0" halign="right" height="20" left="12"
-                                             mouse_opaque="false" name="duration_lbl" v_pad="0" width="70">
-                                                Duration:
-                                        </text>
-                                        <spinner bottom="-200" decimal_digits="0" follows="left|top" height="20" increment="1"
-                                             initial_val="7" left_delta="75" max_val="30" min_val="1"
-                                             mouse_opaque="true" name="duration"
-                                             tool_tip="# of days the election will last." width="40" />
-                                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                                             bottom="-203" drop_shadow_visible="true" follows="left|top"
-                                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left_delta="45"
-                                             mouse_opaque="false" name="duration_days" v_pad="0" width="300">
-                                                days
-                                        </text>
-                                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                                             bottom="-224" drop_shadow_visible="true" follows="left|top"
-                                             font="SansSerifSmall" h_pad="0" halign="right" height="20" left="12"
-                                             mouse_opaque="false" name="start_lbl" v_pad="0" width="70">
-                                                Election Start:
-                                        </text>
-                                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                                             bottom="-224" drop_shadow_visible="true" follows="left|top"
-                                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left_delta="75"
-                                             mouse_opaque="false" name="start_date" v_pad="0" width="200" />
-                                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                                             bottom="-242" drop_shadow_visible="true" follows="left|top"
-                                             font="SansSerifSmall" h_pad="0" halign="right" height="20" left="12"
-                                             mouse_opaque="false" name="end_lbl" v_pad="0" width="70">
-                                                Election Ends:
-                                        </text>
-                                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                                             bottom="-242" drop_shadow_visible="true" follows="left|top"
-                                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left_delta="75"
-                                             mouse_opaque="false" name="end_date" v_pad="0" width="200" />
-                                </panel>
-                                <panel bottom="-284" follows="left|top|right|bottom" height="268" label="Proposal"
-                                     left="1" mouse_opaque="true" name="panel_group_proposals" width="398">
-                                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                                             bottom="-18" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-                                             h_pad="0" halign="left" height="10" left="12" mouse_opaque="false"
-                                             name="txt" v_pad="0" width="363">
-                                                Group Proposals
-                                        </text>
-                                        <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="12"
-                                             mouse_opaque="false" name="instructions" v_pad="0" width="350">
-                                                There are no active proposals.  Press the Create Proposal button to
-create a new proposal.
-                                        </text>
-                                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                                             bottom_delta="-26" drop_shadow_visible="true" follows="left|top"
-                                             font="SansSerifSmall" h_pad="0" halign="right" height="10" left="12"
-                                             mouse_opaque="false" name="proposal_lbl" v_pad="0" width="70">
-                                                Proposals:
-                                        </text>
-                                        <scroll_list background_visible="false" bg_selected_color="0.243137, 0.243137, 0.243137, 1"
-                                             bottom="-190" column_padding="5" draw_border="true"
-                                             fg_disable_color="1, 1, 1, 1" fg_selected_color="0, 0, 0, 1"
-                                             fg_unselected_color="1, 1, 1, 1" follows="left|top" height="134" left="87"
-                                             mouse_opaque="true" multi_select="false" name="proposals" width="290" />
-                                        <text_editor bg_readonly_color="0, 0, 0, 0" bg_writeable_color="1, 1, 1, 1"
-                                             bottom_delta="40" embedded_items="false" follows="left|top"
-                                             font="SansSerif" height="94" left="87" max_length="255" mouse_opaque="true"
-                                             name="proposal_text" text_readonly_color="1, 1, 1, 1" width="290"
-                                             word_wrap="false" />
-                                        <button bottom_delta="-22" follows="top" font="SansSerif" halign="center" height="20"
-                                             label="Yes" label_selected="Yes" left="87" mouse_opaque="true"
-                                             name="btn_yes" width="60" />
-                                        <button bottom="-172" follows="left|top" font="SansSerif" halign="center" height="20"
-                                             label="No" label_selected="No" left_delta="68" mouse_opaque="true"
-                                             name="btn_no" width="60" />
-                                        <button bottom="-172" follows="left|top" font="SansSerif" halign="center" height="20"
-                                             label="Abstain" label_selected="Abstain" left_delta="68"
-                                             mouse_opaque="true" name="btn_abstain" width="60" />
-                                        <button bottom="-172" follows="left|top" font="SansSerif" halign="center" height="20"
-                                             label="View List" label_selected="View List" left_delta="68"
-                                             mouse_opaque="true" name="btn_view_list" width="90" />
-                                        <button bottom_delta="-44" follows="left|top" font="SansSerif" halign="center"
-                                             height="20" label="View Item" label_selected="View Item" left="291"
-                                             mouse_opaque="true" name="btn_view_item" width="90" />
-                                        <button bottom="-216" follows="left|top" font="SansSerif" halign="center" height="20"
-                                             label="Create Proposal" label_selected="Create Proposal" left_delta="-204"
-                                             mouse_opaque="true" name="btn_proposal" width="160" />
-                                        <button bottom_delta="-50" follows="left|top" font="SansSerif" halign="center"
-                                             height="20" label="Submit" label_selected="Submit" left="87"
-                                             mouse_opaque="true" name="btn_submit" width="60" />
-                                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                                             bottom="-200" drop_shadow_visible="true" follows="left|top"
-                                             font="SansSerifSmall" h_pad="0" halign="right" height="20" left="12"
-                                             mouse_opaque="false" name="quorum_lbl" v_pad="0" width="70">
-                                                Quorum:
-                                        </text>
-                                        <spinner bottom="-200" decimal_digits="0" follows="left|top" height="20" increment="1"
-                                             initial_val="0" left_delta="75" max_val="111" min_val="1"
-                                             mouse_opaque="true" name="quorum"
-                                             tool_tip="# of total voting members needed for election results to be binding."
-                                             width="40" />
-                                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                                             bottom="-200" drop_shadow_visible="true" follows="left|top"
-                                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left_delta="45"
-                                             mouse_opaque="false" name="quorum_text" v_pad="0" width="300">
-                                                out of 111 total group members.
-                                        </text>
-                                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                                             bottom="-224" drop_shadow_visible="true" follows="left|top"
-                                             font="SansSerifSmall" h_pad="0" halign="right" height="20" left="210"
-                                             mouse_opaque="false" name="majority_lbl" v_pad="0" width="65">
-                                                Majority:
-                                        </text>
-                                        <radio_group bottom="-260" follows="left|top" height="60" left="270" mouse_opaque="true"
-                                             name="majority" tool_tip="Majority of total votes needed to win."
-                                             width="105">
-                                                <radio_item bottom="-19" follows="left|top" height="15" left="4" mouse_opaque="true"
-                                                     name="radio" width="99">
-                                                        Simple Majority
-                                                </radio_item>
-                                                <radio_item bottom_delta="-19" follows="left|top" height="15" left="4" mouse_opaque="true"
-                                                     name="radio2" width="93">
-                                                        2/3 Majority
-                                                </radio_item>
-                                                <radio_item bottom_delta="-19" follows="left|top" height="15" left="4" mouse_opaque="true"
-                                                     name="radio3" width="93">
-                                                        Unanimous
-                                                </radio_item>
-                                        </radio_group>
-                                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                                             bottom="-227" drop_shadow_visible="true" follows="left|top"
-                                             font="SansSerifSmall" h_pad="0" halign="right" height="20" left="12"
-                                             mouse_opaque="false" name="duration_lbl" v_pad="0" width="70">
-                                                Duration:
-                                        </text>
-                                        <spinner bottom="-224" decimal_digits="0" follows="left|top" height="20" increment="1"
-                                             initial_val="7" left_delta="75" max_val="30" min_val="1"
-                                             mouse_opaque="true" name="duration"
-                                             tool_tip="# of days the election will last." width="40" />
-                                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                                             bottom="-227" drop_shadow_visible="true" follows="left|top"
-                                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left_delta="45"
-                                             mouse_opaque="false" name="duration_text" v_pad="0" width="300">
-                                                days
-                                        </text>
-                                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                                             bottom="-248" drop_shadow_visible="true" follows="left|top"
-                                             font="SansSerifSmall" h_pad="0" halign="right" height="20" left="12"
-                                             mouse_opaque="false" name="start_lbl" v_pad="0" width="70">
-                                                Voting Start:
-                                        </text>
-                                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                                             bottom="-248" drop_shadow_visible="true" follows="left|top"
-                                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left_delta="75"
-                                             mouse_opaque="false" name="start_date" v_pad="0" width="200" />
-                                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                                             bottom="-266" drop_shadow_visible="true" follows="left|top"
-                                             font="SansSerifSmall" h_pad="0" halign="right" height="20" left="12"
-                                             mouse_opaque="false" name="end_lbl" v_pad="0" width="70">
-                                                Voting Ends:
-                                        </text>
-                                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                                             bottom="-266" drop_shadow_visible="true" follows="left|top"
-                                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left_delta="75"
-                                             mouse_opaque="false" name="end_date" v_pad="0" width="200" />
-                                </panel>
-                                <panel bottom="-284" follows="left|top|right|bottom" height="268" label="History"
-                                     left="1" mouse_opaque="true" name="History" width="398">
-                                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                                             bottom="-18" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-                                             h_pad="0" halign="left" height="10" left="12" mouse_opaque="false"
-                                             name="txt" v_pad="0" width="363">
-                                                Group Voting History
-                                        </text>
-                                        <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="12"
-                                             mouse_opaque="false" name="instructions" v_pad="0" width="350">
-                                                You may view past group vote results by selecting the vote and.
-                                        </text>
-                                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                                             bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-                                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
-                                             mouse_opaque="false" name="instructions2" v_pad="0" width="350">
-                                                pressing View Item.
-                                        </text>
-                                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                                             bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
-                                             font="SansSerifSmall" h_pad="0" halign="right" height="10" left="12"
-                                             mouse_opaque="false" name="history_list_lbl" v_pad="0" width="70">
-                                                Past Votes:
-                                        </text>
-                                        <scroll_list background_visible="false" bg_selected_color="1, 1, 1, 1" bottom="-230"
-                                             column_padding="10" draw_border="true" fg_disable_color="1, 1, 1, 1"
-                                             fg_selected_color="0, 0, 0, 1" fg_unselected_color="1, 1, 1, 1"
-                                             follows="left|top" height="170" left="87" mouse_opaque="true"
-                                             multi_select="false" name="history_list" width="300" />
-                                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                                             bottom="-68" drop_shadow_visible="true" follows="left|top"
-                                             font="SansSerifSmall" h_pad="0" halign="right" height="10" left="12"
-                                             mouse_opaque="false" name="vote_text_lbl" v_pad="0" width="70">
-                                                Vote Results:
-                                        </text>
-                                        <text_editor bg_readonly_color="0, 0, 0, 0" bg_writeable_color="1, 1, 1, 1" bottom="-230"
-                                             embedded_items="false" follows="left|top" font="SansSerif" height="170"
-                                             left="87" max_length="1024" mouse_opaque="true" name="vote_text"
-                                             text_readonly_color="1, 1, 1, 1" width="300" word_wrap="false" />
-                                        <button bottom="-260" follows="top" font="SansSerif" halign="center" height="20"
-                                             label="View List" label_selected="View List" left="291" mouse_opaque="true"
-                                             name="btn_view_list" width="90" />
-                                        <button bottom_delta="0" follows="top" font="SansSerif" halign="center" height="20"
-                                             label="View Item" label_selected="View Item" left_delta="0"
-                                             mouse_opaque="true" name="btn_view_item" width="90" />
-                                </panel>
-                        </tab_container>
-                </panel>
-                <panel bottom="-305" follows="left|top|right|bottom" height="289" label="Invite"
-                     left="1" mouse_opaque="true" name="inv" width="456">
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-                             h_pad="0" halign="left" height="16" left="12" mouse_opaque="true"
-                             name="txt" v_pad="0" width="436">
-                                Group Invitations
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
-                             mouse_opaque="true" name="txt2" v_pad="0" width="436">
-                                Invitations are sent via instant message.
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
-                             mouse_opaque="true" name="txt3" v_pad="0" width="436">
-                                Click on the add button to add users to the list.
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-32" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="12"
-                             mouse_opaque="true" name="lbl" v_pad="0" width="70">
-                                Officers:
-                        </text>
-                        <name_list allow_calling_card_drop="true" background_visible="true" bottom="-134"
-                             column_padding="5" draw_border="true" follows="top" height="60" left="87"
-                             mouse_opaque="true" multi_select="false" name="inv officers" width="290" />
-                        <button bottom_delta="-22" follows="top" font="SansSerif" halign="center" height="20"
-                             label="Add Officer..." label_selected="Add Officer..." left="87"
-                             mouse_opaque="true" name="add_officer_btn" width="120" />
-                        <button bottom="-156" follows="top" font="SansSerif" halign="center" height="20"
-                             label="Remove Selected" label_selected="Remove Selected" left_delta="128"
-                             mouse_opaque="true" name="remove_officer_btn" width="120" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-174" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="12"
-                             mouse_opaque="true" name="lbl2" v_pad="0" width="70">
-                                Members:
-                        </text>
-                        <name_list allow_calling_card_drop="true" background_visible="true" bottom="-218"
-                             column_padding="5" draw_border="true" follows="top" height="60" left="87"
-                             mouse_opaque="true" multi_select="false" name="inv members" width="290" />
-                        <button bottom_delta="-22" follows="top" font="SansSerif" halign="center" height="20"
-                             label="Add Member..." label_selected="Add Member..." left="87"
-                             mouse_opaque="true" name="add_member_btn" width="120" />
-                        <button bottom="-240" follows="top" font="SansSerif" halign="center" height="20"
-                             label="Remove Selected" label_selected="Remove Selected" left_delta="128"
-                             mouse_opaque="true" name="remove_member_btn" width="120" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-258" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="12"
-                             mouse_opaque="true" name="lbl3" v_pad="0" width="70">
-                                Signup Fee:
-                        </text>
-                        <spinner bottom="-258" decimal_digits="0" follows="left|top" height="16" increment="1"
-                             initial_val="0" left_delta="75" max_val="1e+007" min_val="0"
-                             mouse_opaque="true" name="fee" width="60" />
-                        <check_box bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Open enrollment (no invite necessary)"
-                             left="87" mouse_opaque="true" name="open" radio_style="false" width="361" />
-                </panel>
-                <panel bottom="-305" follows="left|top|right|bottom" height="289" label="Land"
-                     left="1" mouse_opaque="true" name="land" width="456">
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-24" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
-                             mouse_opaque="true" name="txt" v_pad="0" width="436">
-                                Group Owned Land
-                        </text>
-                        <scroll_list background_visible="true" bottom_delta="-152" column_padding="5"
-                             draw_border="true" follows="top" height="150" left="8" mouse_opaque="true"
-                             multi_select="false" name="parcel list" width="440" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
-                             mouse_opaque="true" name="lbl" v_pad="0" width="180">
-                                Total Contributed Land:
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-210" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="32" left="192"
-                             mouse_opaque="true" name="total" v_pad="0" width="75" />
-                        <button bottom="-198" follows="top" font="SansSerif" halign="center" height="20"
-                             label="Map..." label_selected="Map..." left="380" mouse_opaque="true"
-                             name="map_btn" width="60" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-216" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
-                             mouse_opaque="true" name="lbl2" v_pad="0" width="180">
-                                Total Land In Use:
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-232" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="32" left="192"
-                             mouse_opaque="true" name="committed" v_pad="0" width="75" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-238" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
-                             mouse_opaque="true" name="lbl3" v_pad="0" width="180">
-                                Land Available:
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-254" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="32" left="192"
-                             mouse_opaque="true" name="avail" v_pad="0" width="75" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-260" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
-                             mouse_opaque="true" name="your_contrib_label" v_pad="0" width="180" />
-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-260"
-                             follows="left|top" font="SansSerifSmall" height="16" left_delta="185"
-                             max_length="10" mouse_opaque="true" name="your_contrib" width="60" />
-                        <button bottom="-264" follows="top" font="SansSerif" halign="center" height="20"
-                             label="Set Contribution" label_selected="Set Contribution" left_delta="103"
-                             mouse_opaque="true" name="set_contrib_btn" width="140" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-284" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
-                             mouse_opaque="true" name="warning_label" v_pad="0" width="436">
-                                WARNING: Group maintains too much land. Group members need to contribute more.
-                        </text>
-                </panel>
-                <panel bottom="-305" follows="left|top|right|bottom" height="289" label="Money"
-                     left="1" mouse_opaque="true" name="mon" width="456">
-                        <tab_container bottom="-289" height="285" left="0" mouse_opaque="false"
-                             name="group money history tab" tab_position="top" width="400">
-                                <panel bottom="-284" follows="left|top|right|bottom" height="268" label="Planning"
-                                     left="1" mouse_opaque="true" name="money panel" width="398">
-                                        <text_editor bg_readonly_color="0.784314, 0.819608, 0.8, 1" bottom="-260"
-                                             embedded_items="false" follows="left|top|right|bottom" font="Monospace"
-                                             height="252" left="8" max_length="2147483647" mouse_opaque="true"
-                                             name="money text" width="382" word_wrap="false" />
-                                </panel>
-                                <panel bottom="-284" follows="left|top|right|bottom" height="268" label="Details"
-                                     left="1" mouse_opaque="true" name="money panel2" width="398">
-                                        <text_editor bg_readonly_color="0.784314, 0.819608, 0.8, 1" bottom="-232"
-                                             embedded_items="false" follows="left|top|right|bottom" font="Monospace"
-                                             height="224" left="8" max_length="2147483647" mouse_opaque="true"
-                                             name="money text" width="382" word_wrap="false" />
-                                        <button bottom="-260" follows="left|bottom" font="SansSerif" halign="center"
-                                             height="20" label="&lt; Earlier" label_selected="&lt; Earlier" left="24"
-                                             mouse_opaque="true" name="&lt; Earlier" tool_tip="Go back in time"
-                                             width="80" />
-                                        <button bottom="-260" follows="right|bottom" font="SansSerif" halign="center"
-                                             height="20" label="Later &gt;" label_selected="Later &gt;" left_delta="270"
-                                             mouse_opaque="true" name="Later &gt;" tool_tip="Go forward in time"
-                                             width="80" />
-                                </panel>
-                                <panel bottom="-284" follows="left|top|right|bottom" height="268" label="Sales"
-                                     left="1" mouse_opaque="true" name="money panel3" width="398">
-                                        <text_editor bg_readonly_color="0.784314, 0.819608, 0.8, 1" bottom="-232"
-                                             embedded_items="false" follows="left|top|right|bottom" font="Monospace"
-                                             height="224" left="8" max_length="2147483647" mouse_opaque="true"
-                                             name="money text" width="382" word_wrap="false" />
-                                        <button bottom="-260" follows="left|bottom" font="SansSerif" halign="center"
-                                             height="20" label="&lt; Earlier" label_selected="&lt; Earlier" left="24"
-                                             mouse_opaque="true" name="&lt; Earlier" tool_tip="Go back in time"
-                                             width="80" />
-                                        <button bottom="-260" follows="right|bottom" font="SansSerif" halign="center"
-                                             height="20" label="Later &gt;" label_selected="Later &gt;" left_delta="270"
-                                             mouse_opaque="true" name="Later &gt;" tool_tip="Go forward in time"
-                                             width="80" />
-                                </panel>
-                        </tab_container>
-                </panel>
-        </tab_container>
-        <button bottom="-352" follows="left|bottom" font="SansSerif" halign="center"
-             height="20" label="OK" label_selected="OK" left="320" mouse_opaque="true"
-             name="OK" width="60" />
-        <button bottom="-352" follows="left|bottom" font="SansSerif" halign="center"
-             height="20" label="Cancel" label_selected="Cancel" left_delta="68"
-             mouse_opaque="true" name="Cancel" width="60" />
-</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_image_preview.xml b/linden/indra/newview/skins/default/xui/en-us/floater_image_preview.xml
index 32a715e..6e72dee 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_image_preview.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_image_preview.xml
@@ -11,7 +11,7 @@
                Description:
        </text>
        <line_editor bottom_delta="-24" follows="top|left|right" height="19" max_length="254"
-             name="description_form" width="280" />
+             name="description_form" width="280" spell_check="true" />
        <text bottom_delta="-20" follows="top|left" height="15" name="preview_label">
                Preview image as:
        </text>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_inspect.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inspect.xml
index fbb1133..5e9cacd 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_inspect.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_inspect.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
-     min_height="300" min_width="400" name="inspect"
+     min_height="300" min_width="550" name="inspect"
     rect_control="FloaterInspectRect" title="Inspect Objects">
        <scroll_list bottom="30" can_resize="false" column_padding="0" draw_heading="true"
             follows="top|right|left|bottom" left="10" multi_select="false"
@@ -9,16 +9,26 @@
             top="-20">
                <column dynamicwidth="true" label="Object Name" name="object_name" />
                <column dynamicwidth="true" label="Owner Name" name="owner_name" />
+                <column dynamicwidth="true" label="Last Owner Name" name="last_owner_name" />
                <column dynamicwidth="true" label="Creator Name" name="creator_name" />
+                <column label="Faces" name="face_num" width="70" />
+                <column label="Vertices" name="vertex_num" width="70" />
+                <column label="Scripts" name="script_num" width="70" />
+                <column label="Inv Total" name="inv_num" width="70" />
                <column label="Creation Date" name="creation_date" width="150" />
        </scroll_list>
        <button bottom="5" follows="left|bottom" font="SansSerif" halign="center" height="20"
-             label="See Owner Profile..." label_selected="" left="10"
+             label="Owner Profile" label_selected="" left="10"
             mouse_opaque="true" name="button owner"
-             tool_tip="See profile of the highlighted object&apos;s owner" width="150" />
+             tool_tip="See profile of the highlighted object&apos;s owner" width="130" />
        <button bottom="5" follows="left|bottom" font="SansSerif" halign="center" height="20"
-             label="See Creator Profile..." label_selected="" left="170"
+             label="Last Owner Profile" label_selected="" left="150"
+             mouse_opaque="true" name="button_last_owner"
+             tool_tip="See profile of the highlighted object&apos;s last owner"
+             width="130" />
+        <button bottom="5" follows="left|bottom" font="SansSerif" halign="center" height="20"
+             label="Creator Profile" label_selected="" left="290"
             mouse_opaque="true" name="button creator"
             tool_tip="See profile of the highlighted object&apos;s original creator"
-             width="150" />
+             width="130" />
 </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 98d2020..4ccfe60 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
@@ -37,17 +37,20 @@
        <string name="unavailable_text_label">
                Text chat is not available for this call.
        </string>
-  <string name="history_entry">
+  <string name="add_friend_string">
-    History
+    Add Friend
-  </string>
-  <string name="pay_entry">
-    Pay
-  </string>
-  <string name="teleport_entry">
-    Offer Teleport
  </string>
  <flyout_button bottom="-40" follows="left|top" height="20" label="Profile" left="5" width="90"
       list_position="below" mouse_opaque="true" name="profile_callee_btn">
+    <flyout_button_item value="history_entry" name="history_entry">
+      View History
+    </flyout_button_item>
+    <flyout_button_item value="pay_entry" name="pay_entry">
+      Pay
+    </flyout_button_item>
+    <flyout_button_item value="teleport_entry" name="teleport_entry">
+     Offer Teleport
+    </flyout_button_item>
  </flyout_button>
        <button bottom="-40" follows="left|top" halign="center" height="20"
             image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
@@ -74,13 +77,13 @@
             follows="left|top|right|bottom" font="SansSerif" height="221" left="5"
             max_length="2147483647" mouse_opaque="true" name="im_history"
             text_color="ChatHistoryTextColor"
-       track_bottom="true" 
+                 track_bottom="true" 
             text_readonly_color="ChatHistoryTextColor" width="487" word_wrap="true" />
        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7"
             follows="left|right|bottom" font="SansSerif" height="20"
             label="Click here to instant message" left="5" max_length="1022"
             mouse_opaque="true" name="chat_editor" select_all_on_focus_received="false"
-             select_on_focus="false" tab_group="1" width="423" />
+             select_on_focus="false" tab_group="1" width="423" spell_check="true" />
        <button bottom="7" follows="right|bottom" font="SansSerif" halign="center" height="20"
             label="Send" left="433" mouse_opaque="true" name="send_btn"
             scale_image="true" width="60" />
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 cac33d7..a059cde 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
@@ -48,7 +48,7 @@
                             bottom="-265" embedded_items="false" enabled="false"
                             follows="left|top|right|bottom" font="SansSerif" height="239" left="5"
                             max_length="2147483647" mouse_opaque="true" name="im_history"
-           track_bottom="true" 
+                                 track_bottom="true" 
                             text_color="ChatHistoryTextColor"
                             text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true" />
                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7"
@@ -56,7 +56,7 @@
                             handle_edit_keys_directly="false" height="20"
                             label="Click here to instant message" left="5" max_length="1022"
                             mouse_opaque="true" name="chat_editor" select_all_on_focus_received="false"
-                             select_on_focus="false" tab_group="1" width="426" />
+                             select_on_focus="false" tab_group="1" width="426" spell_check="true" />
                        <button bottom_delta="0" enabled="true" follows="right|bottom" font="SansSerif"
                             halign="center" height="20" label="Send" left="436" mouse_opaque="true"
                             name="send_btn" scale_image="true" width="60" />
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 d851075..82311cd 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
@@ -44,18 +44,20 @@
             orientation="horizontal" tab_group="1" width="495" name="panels">
                <layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right"
                     height="130" left="0" min_width="210" name="im_contents_panel" width="175">
-                        <button bottom="-20" follows="left|top" height="20" label="Group Info" left="5"
+                        <flyout_button bottom="-20" follows="left|top" height="20" label="Group Info" left="5"
-                             name="group_info_btn" tab_group="0" width="90" />
+                             list_position="below" name="group_info_btn" tab_group="0" width="110">
+        <flyout_button_item value="history_entry" name="history_entry">
+          View History
+        </flyout_button_item>
+      </flyout_button>
                        <button bottom_delta="0" enabled="false" follows="left|top" halign="right" height="20"
                             image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
-                             label="Join Call" left_delta="95" name="start_call_btn" pad_right="12"
+                             label="Join Call" left_delta="115" name="start_call_btn" pad_right="12"
                             width="92" />
                        <button bottom_delta="0" follows="left|top" halign="right" height="20"
                             image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
                             label="End Call" left_delta="0" name="end_call_btn" pad_right="12"
                             visible="false" width="92" />
-      <button bottom="-20" follows="left|top" halign="center" height="20" label="History" left_delta="97"
-              name="history_btn" visible="true" width="85" />
                        <button name="toggle_active_speakers_btn"
                             label="&lt;&lt;" label_selected="&gt;&gt;" follows="right|top"
                             bottom_delta="0" left="133" right="176" height="20"
@@ -65,14 +67,14 @@
                             follows="left|top|right|bottom" font="SansSerif" left="4"
                             max_length="2147483647" mouse_opaque="true" name="im_history"
                             text_color="ChatHistoryTextColor"
-           track_bottom="true" 
+                                 track_bottom="true" 
                             text_readonly_color="ChatHistoryTextColor" top="104" width="170"
                             word_wrap="true" />
                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7"
                             enabled="true" follows="left|right|bottom" font="SansSerif" height="20"
                             left="5" max_length="1022" mouse_opaque="true" name="chat_editor"
                             select_all_on_focus_received="false" select_on_focus="false" tab_group="1"
-                             width="106" />
+                             width="106" spell_check="true" />
                        <button bottom="7" enabled="true" follows="right|bottom" font="SansSerif"
                             halign="center" height="20" label="Send" left="116" mouse_opaque="true"
                             name="send_btn" scale_image="true" width="60" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_inventory_item_properties.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inventory_item_properties.xml
index 5b111eb..88992a2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_inventory_item_properties.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_inventory_item_properties.xml
@@ -24,7 +24,7 @@
        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-61"
             enabled="true" follows="left|top|right" font="SansSerifSmall" height="16"
             is_unicode="false" left="88" max_length="127" mouse_opaque="true"
-             name="LabelItemDesc" width="252" />
+             name="LabelItemDesc" width="252" spell_check="true" />
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-81" drop_shadow_visible="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml b/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml
new file mode 100644
index 0000000..f9bb3a7
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Local Asset Browser: xui -->
+<!-- floater definition start -->
+<floater
+        name="local_bitmap_browser_floater"
+        title="Local Texture Properties"
+        can_resize="false"
+        can_minimize="true"
+        can_close="true"
+        can_drag_on_left="false"
+        width="415"
+        height="460"
+        min_width="415"
+        min_height="460"
+  rect_control="FloaterLocalbitmapbrowserRect"
+        >
+  <button
+    name="add_btn"
+    label="Add"
+    left="12.5"
+    bottom="-45"
+    width="90"
+    height="20"
+                />
+  <button
+                name="del_btn"
+                label="Remove"
+                left_delta="95"
+          bottom_delta="0"
+                width="90"
+                height="20"
+                />
+  <button
+    name="upload_btn"
+    label="Upload Image ([UPLOADFEE])..."
+    right="-5"
+    bottom_delta="0"
+    width="170"
+    height="20"
+    follows="left|top"
+                />
+  
+  <scroll_list
+    name="bitmap_list"
+    left="10"
+    bottom_delta="-205"
+    width="395"
+    height="200"
+    column_padding="0"
+    can_resize="false"
+    draw_heading="true"
+    multi_select="false"
+    search_column="1"
+    follows="bottom|top"
+                >
+    <column name="bitmap_name" label="Name" dynamicwidth="true" />
+    <column name="bitmap_uuid" label="UUID" width="240" />
+  </scroll_list>
+  
+  <line_editor
+    bevel_style="in"
+    border_style="line"
+    border_thickness="1"
+    mouse_opaque="true"
+    follows="left|top"
+    height="16"
+    bottom="16"
+    left="10"
+    name="path_text"
+    select_all_on_focus_received="true"
+    width="305"
+    visible="true"
+    />
+  <text name="path_caption_text"
+    left_delta="0"
+    bottom_delta="20"
+    follows="left|top"
+    width="100"
+    height="16"
+    visible="true"
+          >
+    Local path:
+  </text>
+  <line_editor
+    bevel_style="in"
+    border_style="line"
+    border_thickness="1"
+    mouse_opaque="true"
+                follows="left|top"
+    height="16"
+    bottom_delta="20"
+    left_delta="0"
+    name="uuid_text"
+          select_all_on_focus_received="true"
+    width="305"
+    visible="true"
+    />
+  <text name="uuid_caption_text"
+    left_delta="0"
+    follows="left|top"
+    bottom_delta="21"
+    width="260"
+    height="16"
+    visible="true"
+          >
+    Local UUID:
+  </text>
+  <texture_picker
+    allow_no_texture="false"
+    height="100"
+    width="80"
+    default_image_name="Default"
+    can_apply_immediately="true"
+    follows="left|top"
+    label="Texture"
+    bottom_delta="20"
+    left_delta="0"
+    mouse_opaque="true"
+    name="texture_view"
+    visible="true"
+    />
+  <check_box
+    bottom_delta="15"
+    left_delta="100"
+    follows="left|top"
+    height="16"
+    initial_value="true"
+    label="Keep updating"
+    mouse_opaque="true"
+    name="keep_updating_checkbox"
+    tool_tip="Enable or disable periodic checks if the source bitmap on your hard drive has been updated"
+    width="166"
+    visible="true"
+    enabled="true"
+    />
+  <combo_box
+    visible="true"
+    allow_text_entry="false"
+    bottom_delta="0"
+    follows="left|top"
+    height="18"
+    left_delta="120"
+    max_chars="20"
+    mouse_opaque="true"
+    name="type_combobox"
+    width="83"
+    >
+    <combo_item name="type_texture" value="type_texture">
+      Texture
+    </combo_item>
+    <combo_item name="type_sculptie" value="type_sculptie">
+      Sculptmap
+    </combo_item>
+    <combo_item name="type_layer" value="type_layer">
+      Clothing
+    </combo_item>
+  </combo_box>
+  <text name="time_caption_text"
+    left_delta="-115"
+    bottom_delta="25"
+    follows="left|top"
+    width="260"
+    height="16"
+    visible="true"
+          >
+    Time:
+  </text>
+  <text name="time_text"
+    left_delta="50"
+    bottom_delta="0"
+    follows="left|top"
+    width="260"
+    height="16"
+          visible="true"
+    >
+    (date here)
+  </text>
+  <text name="link_caption_text"
+    left_delta="-50"
+    bottom_delta="20"
+    follows="left|top"
+    width="260"
+    height="16"
+    visible="true"
+          >
+    Link:
+  </text>
+  <text name="link_text"
+    left_delta="50"
+    bottom_delta="0"
+    follows="left|top"
+    width="260"
+    height="16"
+    visible="true"
+    >
+    (link status)
+  </text>
+  <text name="name_caption_text"
+    left_delta="-50"
+    bottom_delta="20"
+    follows="left|top"
+    width="260"
+    height="16"
+    visible="true"
+        >
+    Name:
+  </text>
+  <line_editor
+    bevel_style="in"
+    border_style="line"
+    border_thickness="1"
+    mouse_opaque="true"
+                follows="left|top"
+    height="16"
+    bottom_delta="0"
+    left_delta="50"
+    name="name_text"
+          select_all_on_focus_received="true"
+    width="150"
+    visible="true"
+    />
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
index b30ca89..c1bfdcc 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
@@ -18,7 +18,20 @@
                        <button bottom_delta="0" enabled="true" follows="right|top" height="20" label="Home"
                             left_delta="58" name="home" width="55" />
                </layout_panel>
-                <layout_panel auto_resize="false" bottom="0" height="20" left="0"
+    <layout_panel auto_resize="false" bottom="0" height="20" left="0" name="time_controls" user_resize="false"
+                     width="800">
+      <button bottom="0" follows="left|top" height="20" label="rewind" left="0" name="rewind"
+                             width="55" />
+      <button bottom_delta="0" follows="left|top" height="20" label="" left_delta="55"
+                             name="play" width="55" image_unselected="button_anim_play.tga"     image_selected="button_anim_play_selected.tga" scale_image="true" />
+      <button bottom_delta="0" follows="left|top" height="20" label="" left_delta="0"
+                             name="pause" width="55" image_unselected="button_anim_pause.tga"   image_selected="button_anim_pause_selected.tga" scale_image="true" />
+      <button bottom_delta="0" follows="left|top" height="20" label="stop"
+                             left_delta="65" name="stop" width="55" />
+      <button bottom_delta="0" follows="left|top" height="20" label="forward"
+                             left_delta="75" name="seek" width="55" />
+    </layout_panel>
+    <layout_panel auto_resize="false" bottom="0" height="20" left="0"
                     name="parcel_owner_controls" user_resize="false" width="540">
                        <button bottom="0" enabled="false" follows="left|top" height="20"
                             label="Send Current URL to Parcel" left="0" name="assign" width="200" />
@@ -38,4 +51,10 @@
                             name="close" width="70" />
                </layout_panel>
        </layout_stack>
+  <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_media_filter.xml b/linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml
new file mode 100644
index 0000000..f0fb3a3
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floatermediafilter" title="Media Filter" rect_control="MediaFilterRect"
+ can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
+ height="410" width="600" min_height="350" min_width="600">
+        <check_box control_name="MediaEnableFilter" name="enable_mediafilter" label="Enable Media Filter"
+         initial_value="true" tool_tip="Enables filtering media URLs by domain names."
+         font="SansSerifSmall" mouse_opaque="true"
+         left="14" height="16" bottom_delta="-45" width="4500" follows="left|top" />
+        <check_box control_name="MediaFilterOnlyRemoteCommands" name="filter_only_remote"
+         label="Filter only when a script initiates the stream (less secure)" initial_value="false" 
+         tool_tip="This will prevent popups asking about URLs that are permanently set on a parcel. 
+Only scripted changes to the media URL and scripted requests to start playing a stream will be filtered."
+         font="SansSerifSmall" mouse_opaque="true"
+         left_delta="14" height="16" width="450" follows="left|top" />
+        <text name="info1" font="SansSerif" mouse_opaque="true" halign="center"
+         bottom_delta="-40" left="20" height="20" width="560" follows="left|right|top">
+                Domains in bold are in the persistent list (i.e. they are whitelisted or blacklisted).
+        </text>
+        <text name="info2" font="SansSerif" mouse_opaque="true" halign="center"
+         bottom_delta="-20" left="20" height="20" width="560" follows="left|right|top">
+                Domains in italics are in the session list (i.e. they are temporarily allowed or denied).
+        </text>
+        <scroll_list name="whitelist_list" follows="top|bottom|left"
+         background_visible="true" mouse_opaque="true"
+         multi_select="false" column_padding="5" draw_border="true" draw_heading="true"
+         bottom_delta="-200" left="15" height="200" width="280">
+                <column name="whitelist_col" label="Allowed domains or server objects" dynamicwidth="true" />
+        </scroll_list>
+        <scroll_list name="blacklist_list" follows="top|bottom|right"
+         background_visible="true" mouse_opaque="true"
+         multi_select="false" column_padding="5" draw_border="true" draw_heading="true"
+         bottom_delta="0" right="-15" height="200" width="280">
+                <column name="blacklist_col" label="Blocked domains or server objects" dynamicwidth="true" />
+        </scroll_list>
+        <button name="add_whitelist" font="SansSerif" label="Add..." halign="center"
+         tool_tip="Add a server to the whitelist"
+         enabled="true" mouse_opaque="true" follows="bottom|left"
+         bottom_delta="-25" left="15" height="20" width="80" />
+        <button name="remove_whitelist" font="SansSerif" label="Remove" halign="center"
+         tool_tip="Remove the selected server from the whitelist"
+         enabled="true" mouse_opaque="true" follows="bottom|left"
+         bottom_delta="0" left="100" height="20" width="80" />
+        <button name="clear_lists" font="SansSerif" label="Clear lists" halign="center"
+         tool_tip="Clear all lists"
+         enabled="true" mouse_opaque="true" follows="bottom|left"
+         bottom_delta="0" left="205" height="20" width="90" />
+        <button name="show_ips" font="SansSerif" label="Show IPs" halign="center"
+         tool_tip="Show the IP associated with each domain name (makes the viewer pause while the list is refreshed, because of DNS lookups)"
+         enabled="true" mouse_opaque="true" follows="bottom|right"
+         bottom_delta="0" right="-205" height="20" width="90" />
+        <button name="add_blacklist" font="SansSerif" label="Add..." halign="center"
+         tool_tip="Add a server to the blacklist"
+         enabled="true" mouse_opaque="true" follows="bottom|right"
+         bottom_delta="0" right="-100" height="20" width="80" />
+        <button name="remove_blacklist" font="SansSerif" label="Remove" halign="center"
+         tool_tip="Remove the selected server from the blacklist"
+         enabled="true" mouse_opaque="true" follows="bottom|right"
+         bottom_delta="0" right="-15" height="20" width="80" />
+        <text name="add_text" font="SansSerif" mouse_opaque="true"
+         bottom_delta="-25" left="20" height="20" width="450" follows="left|right|bottom">
+                New domain:
+        </text>
+        <check_box name="match_ip" label="Add/remove matching IP" initial_value="true"
+         tool_tip="Add or remove any IP associated with the added or removed domain name"
+         font="SansSerifSmall" mouse_opaque="true" radio_style="false"
+         bottom_delta="2" right="-95" height="16" width="70" follows="right|bottom" />
+        <line_editor name="input_domain" max_length="255" font="SansSerif" enabled="false"
+         tool_tip="Enter the new URL, domain name, IP or scripted object HTTP server path here"
+         select_all_on_focus_received="true" select_on_focus="true"
+         bevel_style="in" border_style="line" border_thickness="1"
+         bottom_delta="-22"     right="-180" height="20" left="15" follows="left|bottom|right"/>
+        <button name="cancel_domain" font="SansSerif" label="Cancel" halign="center" enabled="false"
+         mouse_opaque="true" follows="bottom|right"
+         bottom_delta="0" right="-15" height="20" width="80"/>
+        <button name="commit_domain" font="SansSerif" label="Add" halign="center" enabled="false"
+         tool_tip="Add to the list"
+         mouse_opaque="true" follows="bottom|right"
+         bottom_delta="0" right="-95" height="20" width="80"/>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_message_builder.xml b/linden/indra/newview/skins/default/xui/en-us/floater_message_builder.xml
new file mode 100644
index 0000000..c7c49d8
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_message_builder.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Message Builder" title="Message Builder" width="400" min_width="400" height="600" min_height="600" can_close="true" can_resize="true" can_minimize="true">
+        <scroll_list column_padding="0" draw_heading="false" follows="left|top|right" left="10" top="-25"
+                          name="net_list" search_column="0" right="-10" bottom="450">
+                <column dynamicwidth="true" name="text" label="text" />
+                <column name="state" label="state" width="24" />
+        </scroll_list>
+        <combo_box name="untrusted_message_combo" allow_text_entry="false" follows="left|top" left="10" top="-150" right="-370" bottom="433" tool_tip="No trust">
+        </combo_box>
+        <combo_box name="trusted_message_combo" allow_text_entry="false" follows="left|top" left="30" top="-150" right="-350" bottom="433" tool_tip="Trust">
+        </combo_box>
+        <text_editor name="message_edit" follows="left|top|right|bottom" left="10" top="-168" bottom="30" right="-10" max_length="65535">
+        </text_editor>
+        <button name="send_btn" follows="right|bottom" left="310" top="-570" right="-10" bottom="10" label="Send" tool_tip="Send (Ctrl+Enter)"/>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_message_log.xml b/linden/indra/newview/skins/default/xui/en-us/floater_message_log.xml
new file mode 100644
index 0000000..e1ebfe2
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_message_log.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Message Log" title="Message Log" width="400" min_width="400" height="600" min_height="600" can_close="true" can_resize="true" can_minimize="true">
+        <scroll_list column_padding="0" draw_heading="false" follows="left|top|right" left="10" top="-25"
+                          name="net_list" search_column="0" right="-10" bottom="450">
+                <column dynamicwidth="true" name="text" label="text" />
+                <column name="icon0" label="icon0" width="24" />
+                <column name="icon1" label="icon1" width="24" />
+        </scroll_list>
+        <button name="filter_choice_btn" follows="left|top" left="10" top="-150" right="-370" bottom="430" label="…"/>
+        <line_editor name="filter_edit" follows="left|top|right" left="30" top="-149" right="-28" bottom="430" max_length="65535"/>
+        <button name="filter_apply_btn" follows="top|right" left="370" top="-150" right="-9" bottom="430" label="✔"/>
+        <button name="clear_log_btn" follows="top|right" left="370" top="-170" right="-9" bottom="410" label="C"/>
+        <scroll_list column_padding="0" draw_heading="false" follows="left|top|right" left="10" top="-190"
+                          name="message_log" search_column="0" right="-10" bottom="200">
+                <column name="sequence" label="sequence" width="48"/>
+                <column name="type" label="type" width="32"/>
+                <column name="direction" label="direction" width="32"/>
+                <column name="net" label="net" width="100"/>
+                <column name="name" label="name" width="128"/>
+                <!--<column name="flag_zer" label="zer" width="8"/>
+                <column name="flag_rel" label="rel" width="8"/>
+                <column name="flag_rsd" label="rsd" width="8"/>
+                <column name="flag_ack" label="ack" width="8"/>-->
+                <column name="summary" label="summary" dynamicwidth="true"/>
+        </scroll_list>
+        <text name="log_status_text" follows="left|top|right" left="10" top="-172" right="-10" height="20">
+        </text>
+        <text_editor name="net_info" follows="left|top|right|bottom" left="10" top="-400" bottom="30" right="-10" enabled="false" max_length="65535">
+        </text_editor>
+        <button name="send_to_message_builder_btn" follows="right|bottom" left="210" top="-570" right="-10" bottom="10" label="Send to Message Builder" enabled="false"/>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
index 8dfd43c..e02abe2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="minimap" short_title="Mini-Map"
-         height="455" width="200" min_height="400" min_width="240"
+         height="455" width="200" min_height="325" min_width="200"
         follows="top|right" can_close="true" can_drag_on_left="false"
         can_minimize="true" can_resize="true" can_tear_off="false"
               rect_control="FloaterMiniMapRect">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_name_description.xml b/linden/indra/newview/skins/default/xui/en-us/floater_name_description.xml
index a91d9e2..e319293 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_name_description.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_name_description.xml
@@ -11,7 +11,7 @@
                Description:
        </text>
        <line_editor follows="top|left|right" height="19" max_length="254" name="description_form"
-             width="280" />
+             width="280" spell_check="true" />
        <button bottom="10" follows="bottom|right" height="20" label="Cancel" left="182"
             name="cancel_btn" width="64" />
        <button bottom="10" follows="bottom|left" height="20" label="Upload ([UPLOADFEE])" left="31"
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 51cd2f5..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:
@@ -265,7 +265,7 @@ now wearing into it.
             enabled="true" follows="left|top" font="SansSerif"
             handle_edit_keys_directly="true" height="20" left="13" max_length="63"
             mouse_opaque="true" name="name ed" select_all_on_focus_received="false"
-             select_on_focus="false" width="489">
+             select_on_focus="false" width="489" spell_check="true">
                New Outfit
        </line_editor>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_pay.xml b/linden/indra/newview/skins/default/xui/en-us/floater_pay.xml
index be53b41..3938a90 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_pay.xml
@@ -43,7 +43,7 @@
        <line_editor name="message" max_length="140"
                     bottom_delta="1" left="80" height="18" right="-15"
                     bevel_style="in" border_style="line" border_thickness="1"
-                     follows="left|top|right" font="SansSerif" />
+                     follows="left|top|right" font="SansSerif" spell_check="true" />
        <text name="amount text"
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 97cbeb8..fd2ad39 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
@@ -25,13 +25,13 @@
        </text>
        <line_editor bottom_delta="-6" follows="left|top" height="20"
             label="Type your subject here." left="120" max_length="100"
-             name="subject_form" width="150" />
+             name="subject_form" width="150" spell_check="true" />
        <text bottom_delta="-23" follows="top|left" font="SansSerif" left="12"
             name="msg_label">
                Message:
        </text>
        <text_editor bottom_delta="-150" follows="left|top|right|bottom" height="140" left="12"
-             max_length="700" name="msg_form" width="420">
+             max_length="700" name="msg_form" width="420" spell_check="true">
                Type your message here.
        </text_editor>
        <text bottom_delta="-37" follows="left|bottom" font="SansSerifSmall" left="12"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml
index 214db25..213147a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml
@@ -1,25 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-666" can_close="true" can_drag_on_left="false" can_minimize="true"
     can_resize="false" can_tear_off="true" default_tab_group="1" enabled="true"
-     height="460" left="330" min_height="213" min_width="324"
+     height="510" left="330" min_height="213" min_width="324"
     mouse_opaque="true" name="Preferences" title="Preferences" width="620">
-        <button bottom="-455" enabled="true" follows="right|bottom" font="SansSerif"
+        <button bottom="-505" enabled="true" follows="right|bottom" font="SansSerif"
             halign="center" height="20" label="OK" label_selected="OK" left="335"
             mouse_opaque="true" name="OK" scale_image="true" width="90" />
-        <button bottom="-455" enabled="true" follows="right|bottom" font="SansSerif"
+        <button bottom="-505" enabled="true" follows="right|bottom" font="SansSerif"
             halign="center" height="20" label="Cancel" label_selected="Cancel"
             left_delta="93" mouse_opaque="true" name="Cancel" scale_image="true"
             width="90" />
-        <button bottom="-455" enabled="true" follows="right|bottom" font="SansSerif"
+        <button bottom="-505" enabled="true" follows="right|bottom" font="SansSerif"
             halign="center" height="20" label="Apply" label_selected="Apply"
             left_delta="93" mouse_opaque="true" name="Apply" scale_image="true"
             width="90" />
-        <button bottom="-455" enabled="true" follows="left|bottom" font="SansSerif"
+        <button bottom="-505" enabled="true" follows="left|bottom" font="SansSerif"
             halign="center" height="20"
-             help_url="http://secondlife.com/app/help/technical/preferences.php"
+             help_url="http://support.imprudenceviewer.org/"
-             label="Help" label_selected="Help" left="9" mouse_opaque="true"
+             label="Support" left="9" mouse_opaque="true"
-             name="Help" scale_image="true" width="90" />
+             name="Support" scale_image="true" width="90" />
-        <tab_container bottom="-431" enabled="true" follows="left|top|right|bottom" height="410"
+  <button bottom_delta="0" follows="left|bottom" font="SansSerif" height="20" width="160"
+       label="Reset All To Default" name="reset_btn" left_delta="95"
+       tool_tip="Reset all preferences to their default values (requires a restart)" />
+  <tab_container bottom="-476" enabled="true" follows="left|top|right|bottom" height="455"
             left="0" mouse_opaque="false" name="pref core" tab_group="1"
             tab_position="left" tab_width="120" width="620" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_preview_animation.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_animation.xml
index 657898a..3eef081 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_preview_animation.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_animation.xml
@@ -6,7 +6,7 @@
             enabled="true" follows="left|top|right" font="SansSerif"
             handle_edit_keys_directly="false" height="19" left="93" max_length="127"
             mouse_opaque="true" name="desc" select_all_on_focus_received="false"
-             select_on_focus="false" width="194" />
+             select_on_focus="false" width="194" spell_check="true" />
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerif" h_pad="0" halign="left" height="19" left="13"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_preview_gesture.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_gesture.xml
index 09fe2c0..590ff32 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_preview_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_gesture.xml
@@ -19,7 +19,7 @@
                Description:
        </text>
        <line_editor bottom_delta="-6" follows="left|top" height="20" left="100" max_length="254"
-             name="desc" width="330" />
+             name="desc" width="330" spell_check="true" />
        <text bottom_delta="-23" follows="top|left" font="SansSerif" left="16"
             name="trigger_label">
                Trigger:
@@ -34,7 +34,7 @@
        <line_editor bottom_delta="-6" follows="left|top" height="20" left="300" max_length="31"
             name="replace_editor"
             tool_tip="Replace the trigger word(s) with these words. For example, trigger &apos;hello&apos; replace with &apos;howdy&apos; will turn the chat &apos;I wanted to say hello&apos; into &apos;I wanted to say howdy&apos; as well as playing the gesture"
-             width="130" />
+             width="130" spell_check="true" />
        <text bottom_delta="-23" follows="top|left" font="SansSerif" left="16"
             name="key_label">
                Shortcut Key:
@@ -78,7 +78,7 @@ unless you add wait steps.
        <combo_box bottom_delta="0" follows="top|left" height="20" left_delta="0"
             name="sound_list" width="100" />
        <line_editor bottom_delta="0" follows="top|left" height="20" left_delta="0" max_length="127"
-             name="chat_editor" width="100" />
+             name="chat_editor" width="100" spell_check="true" />
        <radio_group bottom_delta="-20" draw_border="false" follows="top|left" height="40"
             left="340" name="animation_trigger_type" width="80">
                <radio_item bottom_delta="-5" follows="left|top" height="16" left="3" mouse_opaque="true"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml
index a625598..fe2d977 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml
@@ -16,7 +16,7 @@
             enabled="true" follows="left|top|right" font="SansSerif"
             handle_edit_keys_directly="false" height="19" left="93" max_length="127"
             mouse_opaque="true" name="desc" select_all_on_focus_received="false"
-             select_on_focus="false" width="294" />
+             select_on_focus="false" width="294" spell_check="true" />
        <menu_bar bottom="-56" drop_shadow="false" enabled="true" follows="left|top|right"
             height="18" left="8" mouse_opaque="false" name="motecard_menu" opaque="false"
             tear_off="false" width="220">
@@ -55,7 +55,7 @@
        <text_editor type="string" length="1" bottom="-344" embedded_items="true" enabled="true"
             follows="left|top|right|bottom" font="SansSerif" height="285"
             ignore_tab="false" left="4" max_length="65536" mouse_opaque="true"
-             name="Notecard Editor" width="392" word_wrap="true">
+             name="Notecard Editor" width="392" word_wrap="true" spell_check="true">
                Loading...
        </text_editor>
        <button bottom="-370" enabled="false" follows="left|bottom" font="SansSerif"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard_keep_discard.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard_keep_discard.xml
index ec3ce5a..f2be796 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard_keep_discard.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard_keep_discard.xml
@@ -16,7 +16,7 @@
             enabled="true" follows="left|top|right" font="SansSerif"
             handle_edit_keys_directly="false" height="19" left="93" max_length="127"
             mouse_opaque="true" name="desc" select_all_on_focus_received="false"
-             select_on_focus="false" width="294" />
+             select_on_focus="false" width="294" spell_check="true" />
        <menu_bar bottom="-56" drop_shadow="false" enabled="true" follows="left|top|right"
             height="18" left="8" mouse_opaque="false" name="motecard_menu" opaque="false"
             tear_off="false" width="220">
@@ -55,7 +55,7 @@
        <text_editor type="string" length="1" bottom="-344" embedded_items="true" enabled="true"
             follows="left|top|right|bottom" font="SansSerif" height="285"
             ignore_tab="false" left="4" max_length="65536" mouse_opaque="true"
-             name="Notecard Editor" width="392" word_wrap="true">
+             name="Notecard Editor" width="392" word_wrap="true" spell_check="true">
                Loading...
        </text_editor>
        <button bottom="-370" enabled="true" follows="left|bottom" font="SansSerif"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_preview_sound.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_sound.xml
index 9ac36d3..0c422f1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_preview_sound.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_sound.xml
@@ -6,7 +6,7 @@
             enabled="true" follows="left|top|right" font="SansSerif"
             handle_edit_keys_directly="false" height="19" left="95" max_length="127"
             mouse_opaque="true" name="desc" select_all_on_focus_received="false"
-             select_on_focus="false" width="192" />
+             select_on_focus="false" width="192" spell_check="true" />
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerif" h_pad="0" halign="left" height="19" left="13"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_preview_texture.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_texture.xml
index f52b1b6..2ca2197 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_preview_texture.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_texture.xml
@@ -13,7 +13,7 @@
             enabled="true" follows="left|top|right" font="SansSerif"
             handle_edit_keys_directly="false" height="19" left="93" max_length="127"
             mouse_opaque="true" name="desc" select_all_on_focus_received="false"
-             select_on_focus="false" width="229" />
+             select_on_focus="false" width="229" spell_check="true" />
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="10" drop_shadow_visible="true" enabled="true" follows="left|bottom"
             font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_preview_texture_keep_discard.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_texture_keep_discard.xml
index 3c4a44d..2c24f45 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_preview_texture_keep_discard.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_texture_keep_discard.xml
@@ -12,7 +12,7 @@
             enabled="true" follows="left|top|right" font="SansSerif"
             handle_edit_keys_directly="false" height="19" left="93" max_length="127"
             mouse_opaque="true" name="desc" select_all_on_focus_received="false"
-             select_on_focus="false" width="194" />
+             select_on_focus="false" width="194" spell_check="true" />
        <button bottom="-322" enabled="true" follows="left|bottom" font="SansSerif"
             halign="center" height="20" label="Keep" label_selected="Keep" left="9"
             mouse_opaque="true" name="Keep" scale_image="true" width="100" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_radar.xml b/linden/indra/newview/skins/default/xui/en-us/floater_radar.xml
new file mode 100644
index 0000000..7db7330
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_radar.xml
@@ -0,0 +1,327 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="radar" title="Radar"
+        can_resize="true" can_minimize="true" can_close="true" can_drag_on_left="false"
+        rect_control="FloaterRadarRect" min_width="300" min_height="300">
+        <scroll_list name="avatar_list"
+                    left="10" right="-10" top="-20" bottom="140" can_resize="true"
+                    column_padding="0" follows="left|top|bottom|right"
+                    draw_heading="true" multi_select="true" search_column="1"
+                    tool_tip="Hold shift or control while clicking to select multiple avatars">
+                <column name="marked" label="Mark" width="12" tool_tip="Marked avatars"/>
+                <column name="avatar_name" label="Name" dynamicwidth="true" tool_tip="Hold shift or control while clicking to select multiple avatars"/>
+                <column name="distance" label="Dist." width="48" tool_tip="Distance from your avatar (red=within chat range, yellow=within shout range, green=within draw distance)"/>
+                <column name="position" label="Pos." width="60" tool_tip="Position (X, Y) within this sim, or general direction (cardinal point) for outside sims"/>
+                <column name="altitude" label="Alt." width="48" tool_tip="Altitude"/>
+        </scroll_list>
+        <tab_container border="false" bottom_delta="-130" height="120" left="6" mouse_opaque="false"
+                       name="actions_tab_container" tab_position="top" follows="left|right|bottom">
+                <panel border="true" bottom_delta="-130" follows="left|top|right|bottom" height="255"
+                       label="Avatar" left="1" mouse_opaque="true"
+                     name="actions_tab" width="398">
+                        <!-- upper row -->
+                        <button
+                               name="profile_btn"
+                               label="Profile"
+                               tool_tip="Show picture, groups, and other information"
+                               left="10"
+                               bottom_delta="-180"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                        <button
+                               name="track_btn"
+                               label="(Un)Track"
+                               tool_tip="Toggle tracking of this avatar's position"
+                               left_delta="90"
+                               bottom_delta="0"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                        <button
+                               name="get_key_btn"
+                               label="Get Key"
+                               tool_tip="Copies avatar's key to the clipboard"
+                               left_delta="90"
+                               bottom_delta="0"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                        <!-- upper middle row -->
+                        <button
+                               name="im_btn"
+                               label="IM"
+                               tool_tip="Open Instant Message session"
+                               left="10"
+                               bottom_delta="-22"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                        <button
+                               name="offer_btn"
+                               label="Offer TP"
+                               tool_tip="Offer Teleport"
+                               left_delta="90"
+                               bottom_delta="0"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                        <button
+                               name="teleport_btn"
+                               label="TP to"
+                               tool_tip="Teleport to avatar's position"
+                               left_delta="90"
+                               bottom_delta="0"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />                       
+                        <!-- lower middle row-->
+                        <button
+                               name="mark_btn"
+                               label="(Un)Mark"
+                               tool_tip="(Un)Mark this avatar in the list"
+                               left="10"
+                               bottom_delta="-22"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                        <button
+                               name="prev_marked_btn"
+                               label="Prev Marked"
+                               tool_tip="Focus camera on previous marked avatar"
+                               left_delta="90"
+                               bottom_delta="0"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                        <button
+                               name="next_marked_btn"
+                               label="Next Marked"
+                               tool_tip="Focus camera on next marked avatar"
+                               left_delta="90"
+                               bottom_delta="0"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                        <!-- lower row-->
+                        <button
+                               name="focus_btn"
+                               label="Focus"
+                               tool_tip="Focus camera on this avatar in the list"
+                               left="10"
+                               bottom_delta="-22"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                        <button
+                               name="prev_in_list_btn"
+                               label="Previous"
+                               tool_tip="Focus camera on previous avatar in list"
+                               left_delta="90"
+                               bottom_delta="0"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                        <button
+                               name="next_in_list_btn"
+                               label="Next"
+                               tool_tip="Focus camera on next avatar in list"
+                               left_delta="90"
+                               bottom_delta="0"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                </panel>
+                <panel border="true" bottom_delta="-150" follows="left|top|right|bottom" height="255"
+                       label="Alerts" left="1" mouse_opaque="true"
+                       name="alerts_tab" width="398">
+                        <check_box height="16" label="Display alerts in chat"
+                                   left="10" bottom_delta="-176" name="radar_alerts" 
+                                   width="200" follows="bottom|left"
+                                   hidden="false" mouse_opaque="true" font="SansSerifSmall"
+                                   initial_value="true" enabled="true" radio_style="false" 
+                                   control_name="RadarChatAlerts"
+                                   tool_tip="Announce alerts about incoming and outgoing avatars in chat" />
+                        <check_box height="16" label="Avatars entering/exiting the sim"
+                                   left="20" bottom_delta="-18" name="alerts_sim"
+                                   width="200" follows="bottom|left"
+                                   hidden="false" mouse_opaque="true" font="SansSerifSmall"
+                                   initial_value="true" enabled="true" radio_style="false"
+                                   control_name="RadarAlertSim"
+                                   tool_tip="Report avatars entering or exiting the sim" />
+                        <check_box height="16" label="Avatars within/beyond the draw distance"
+                                   left="20" bottom_delta="-18" name="alerts_draw"
+                                   width="200" follows="bottom|left"
+                                   hidden="false" mouse_opaque="true" font="SansSerifSmall"
+                                   initial_value="true" enabled="true" radio_style="false"
+                                   control_name="RadarAlertDraw"
+                                   tool_tip="Report avatars getting within or beyond the draw distance" />
+                        <check_box height="16" label="Avatars within/beyond the shout range"
+                                   left="20" bottom_delta="-18" name="alerts_chat"
+                                   width="200" follows="bottom|left"
+                                   hidden="false" mouse_opaque="true" font="SansSerifSmall"
+                                   initial_value="true" enabled="true" radio_style="false"
+                                   control_name="RadarAlertShoutRange"
+                                   tool_tip="Report avatars getting within or beyond the shout range" />
+                        <check_box height="16" label="Avatars within/beyond the chat range"
+                                   left="20" bottom_delta="-18" name="alerts_chat"
+                                   width="200" follows="bottom|left"
+                                   hidden="false" mouse_opaque="true" font="SansSerifSmall"
+                                   initial_value="true" enabled="true" radio_style="false"
+                                   control_name="RadarAlertChatRange"
+                                   tool_tip="Report avatars getting within or beyond the chat range" />
+                </panel>
+                <panel border="true" bottom_delta="-130" follows="left|top|right|bottom" height="255"
+                       label="Moderation" left="1" mouse_opaque="true"
+                       name="land_tab" width="398">
+                        
+                        <!-- Upper row -->
+                        <button
+                               name="mute_btn"
+                               label="(Un)Mute"
+                               tool_tip="Mute or unmute this avatar (muted avatars' names are highlighted in red in the list)."
+                               left="10"
+                               bottom_delta="-200"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                        <button
+                               name="freeze_btn"
+                               label="Freeze"
+                               tool_tip="Freeze the avatar, preventing it from moving"
+                               left_delta="90"
+                               bottom_delta="0"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                        <button
+                               name="ar_btn"
+                               label="AR"
+                               tool_tip="Report abuse on this avatar"
+                               left_delta="90"
+                               bottom_delta="0"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                        <!-- Lower row -->
+                        <button
+                               name="eject_btn"
+                               label="Eject"
+                               tool_tip="Eject the avatar from the parcel"
+                               left="10"
+                               bottom_delta="-24"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                        
+                        <button
+                               name="estate_eject_btn"
+                               label="Eject from estate"
+                               tool_tip="Eject this avatar from the estate"
+                               left_delta="90"
+                               bottom_delta="0"
+                               width="170"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                </panel>
+                <panel border="true" bottom_delta="-150" follows="left|top|right|bottom" height="255"
+                       label="Options" left="1" mouse_opaque="true"
+                       name="options_tab" width="398">
+                        <check_box height="16" label="Update"
+                                   left="10" bottom_delta="-180" name="update_enabled_cb" 
+                                   width="200" follows="bottom|left"
+                                   hidden="false" mouse_opaque="true" font="SansSerifSmall"
+                                   initial_value="true" enabled="true" radio_style="false" 
+                                   tool_tip="Set whether the avatar list should update" />
+                        <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" font="SansSerifSmall" height="18" left="24"
+                                   mouse_opaque="false" name="rate" width="30">
+                                        Rate:
+                        </text>
+                        <radio_group draw_border="true" bottom_delta="2" left_delta="44" follows="bottom|left" width="196" height="20"
+                                   mouse_opaque="true" name="update_rate" control_name="RadarUpdateRate" enabled="true"
+                                   tool_tip="Rate of the radar updates (eats up more FPS when higher)">
+                                <radio_item type="string" length="1" bottom_delta="0" height="16" left_delta="4" mouse_opaque="true"
+                                        name="high" width="20" follows="bottom|left">
+                                        High
+                                </radio_item>
+                                <radio_item type="string" length="1" bottom_delta="0" height="16" left_delta="30" mouse_opaque="true"
+                                        name="medium" width="25" follows="bottom|left">
+                                        Medium
+                                </radio_item>
+                                <radio_item type="string" length="1" bottom_delta="0" height="16" left_delta="35" mouse_opaque="true"
+                                        name="low" width="20" follows="bottom|left">
+                                        Low
+                                </radio_item>
+                        </radio_group>
+                        <check_box height="16" label="Announce even when closed"
+                                   left="10" bottom_delta="-24" name="keep_open"
+                                   width="200" follows="bottom|left"
+                                   hidden="false" mouse_opaque="true" font="SansSerifSmall"
+                                   initial_value="true" enabled="true" radio_style="false"
+                                   control_name="RadarKeepOpen"
+                                   tool_tip="Hides floater instead of closing to still announce in chat" />
+                        <check_box height="16" label="Announce keys to HUD"
+                                   left="10" bottom_delta="-20" name="radar_chat_keys" 
+                                   width="200" follows="bottom|left"
+                                   hidden="false" mouse_opaque="true" font="SansSerifSmall"
+                                   initial_value="true" enabled="true" radio_style="false" 
+                                   control_name="RadarChatKeys"
+                                   tool_tip="Set whether to send keys of avatars to LSL scripts" />
+                        <button
+                               name="send_keys_btn"
+                               label="Announce now"
+                               tool_tip="Send all keys to HUD now"
+                               left_delta="150"
+                               bottom_delta="-2"
+                               width="100"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                </panel>
+        </tab_container>
+</floater>
+\ No newline at end of file
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 ca1cfb1..7dad867 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
@@ -206,7 +206,7 @@ Other
             border_thickness="1" bottom_delta="-18" follows="left|top"
             font="SansSerifSmall" height="16" left="16" max_length="64"
             mouse_opaque="true" name="summary_edit" 
-             width="356" />
+             width="356" spell_check="true" />
        <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"
@@ -224,7 +224,7 @@ if possible.
        <text_editor bottom_delta="-152" embedded_items="false"
             follows="left|top" font="SansSerifSmall" height="146" left="16"
             max_length="800" mouse_opaque="false" name="details_edit"
-             width="356" word_wrap="true" />
+             width="356" word_wrap="true" spell_check="true" />
        <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"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/en-us/floater_report_bug.xml
index 9499690..83d7a5c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_report_bug.xml
@@ -141,7 +141,7 @@
             border_thickness="1" bottom_delta="-16" follows="left|top"
             font="SansSerifSmall" height="16" left="16" max_length="64"
             mouse_opaque="true" name="summary_edit" 
-             width="356" />
+             width="356" spell_check="true" />
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
@@ -151,7 +151,7 @@
        <text_editor bottom_delta="-112" embedded_items="false"
             follows="left|top" font="SansSerifSmall" height="112" left="16"
             max_length="900" mouse_opaque="false" name="details_edit"
-             width="356" word_wrap="true">
+             width="356" word_wrap="true" spell_check="true">
                Steps to reproduce the bug:
 Observed results:
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 82a65b8..0175508 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" show_line_numbers="true">
+             word_wrap="true" show_line_numbers="true" spell_check="false">
                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_preview.xml b/linden/indra/newview/skins/default/xui/en-us/floater_script_preview.xml
index 167aeb7..2e79da2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_script_preview.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_script_preview.xml
@@ -19,5 +19,5 @@
             enabled="true" follows="left|top|right" font="SansSerif"
             handle_edit_keys_directly="false" height="19" left="93" max_length="127"
             mouse_opaque="true" name="desc" select_all_on_focus_received="false"
-             select_on_focus="false" width="394" />
+             select_on_focus="false" width="394" spell_check="true" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_search_replace.xml b/linden/indra/newview/skins/default/xui/en-us/floater_search_replace.xml
index 930cf37..f31f357 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_search_replace.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_search_replace.xml
@@ -31,10 +31,10 @@
             enabled="true" follows="left|top" font="SansSerifSmall"
             handle_edit_keys_directly="false" height="16" left="55" max_length="254"
             mouse_opaque="true" name="search_text" select_all_on_focus_received="false"
-             select_on_focus="false" width="240" />
+             select_on_focus="false" width="240" spell_check="true" />
        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-58"
             enabled="true" follows="left|top" font="SansSerifSmall"
             handle_edit_keys_directly="false" height="16" left="55" max_length="254"
             mouse_opaque="true" name="replace_text"
-             select_all_on_focus_received="false" select_on_focus="false" width="240" />
+             select_all_on_focus_received="false" select_on_focus="false" width="240" spell_check="true" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml
index d91b5ff..3aeba26 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml
@@ -27,7 +27,7 @@
        <icon bottom_delta="-66" follows="top|left" height="64" image_name="badge_note.j2c"
             left="0" name="step_price" width="64" />
        <text bottom_delta="38" follows="top|left" height="16" left="72" name="price_label"
-             right="-20" font="SansSerifBig" >
+             right="-20" font="SansSerifLarge" >
                Set a price:
        </text>
        <text follows="top|left" height="16" left="72" name="price_text" right="-20">
@@ -44,7 +44,7 @@
        <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
             name="step_sell_to" width="64" />
        <text bottom_delta="38" follows="top|left" height="16" left="72" name="sell_to_label"
-             right="-20" font="SansSerifBig" >
+             right="-20" font="SansSerifLarge" >
                Sell the land to:
        </text>
        <text follows="top|left" height="16" left="72" name="sell_to_text" right="-20">
@@ -69,7 +69,7 @@
        <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
             name="step_sell_objects" width="64" />
        <text bottom_delta="38" follows="top|left" height="16" left="72"
-             name="sell_objects_label" right="-20" font="SansSerifBig" >
+             name="sell_objects_label" right="-20" font="SansSerifLarge" >
                Sell the objects with the land?
        </text>
        <text bottom_delta="-20" follows="top|left" height="16" left="72"
@@ -89,7 +89,7 @@
        <button bottom_delta="4" height="16" label="Show Objects" name="show_objects"
             right="414" width="110" />
        <text bottom_delta="-35" follows="top|left" height="16" left="72"
-             name="nag_message_label" right="-20" font="SansSerifBig" >
+             name="nag_message_label" right="-20" font="SansSerifLarge" >
                REMEMBER: All sales are final.
        </text>
        <button bottom="-479" follows="bottom|left" height="20" label="Set Land For Sale"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_settings_debug.xml b/linden/indra/newview/skins/default/xui/en-us/floater_settings_debug.xml
index a8c0840..1dc8a5e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_settings_debug.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_settings_debug.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" height="215" name="settings_debug"
+     can_resize="false" height="235" name="settings_debug"
     title="Debug Settings" width="350">
-        <combo_box allow_text_entry="true" bottom="-50" follows="top|left" font="SansSerifSmall"
+  <search_editor bottom="-45" height="20" name="control_search" visible="true" width="320" 
+                 left="15" label="Type here to search" />
+        <combo_box allow_text_entry="false" bottom_delta="-30" follows="top|left" font="SansSerifSmall"
             height="20" left="15" max_chars="255" name="settings_combo" />
-        <text_editor bottom_delta="-75" enabled="false" height="60" width="320" hide_scrollbar="true"
+        <text_editor bottom_delta="-70" enabled="false" height="60" width="320" hide_scrollbar="true"
             name="comment_text" word_wrap="true" />
        <combo_box bottom_delta="-30" follows="top|left" font="SansSerifSmall" height="20"
             left="15" name="boolean_combo" visible="false">
@@ -15,7 +17,7 @@
                        FALSE
                </combo_item>
        </combo_box>
-        <line_editor bottom_delta="0" height="20" name="val_text" visible="false" width="300" />
+        <line_editor bottom_delta="0" height="20" name="val_text" visible="false" width="320" />
        <color_swatch bottom="30" can_apply_immediately="true" height="55" label="Color"
             name="color_swatch" visible="true" width="37" />
        <spinner bottom_delta="25" height="20" label="x" label_width="40" max_val="10000000"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_sound_preview.xml b/linden/indra/newview/skins/default/xui/en-us/floater_sound_preview.xml
index 3738077..0a755e8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_sound_preview.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_sound_preview.xml
@@ -19,7 +19,7 @@
        </text>
        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-23"
             follows="left|top|right" font="SansSerifSmall" height="19" left="10"
-             max_length="127" mouse_opaque="true" name="description_form" width="280" />
+             max_length="127" mouse_opaque="true" name="description_form" width="280" spell_check="true" />
        <button bottom="-180" follows="right|bottom" font="SansSerif" halign="center"
             height="20" label="Cancel" label_selected="Cancel" left="200"
             mouse_opaque="true" name="cancel_btn" width="90" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_teleport_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_teleport_history.xml
new file mode 100644
index 0000000..13956e2
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_teleport_history.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
+                min_width="600" min_height="250" width="600" height="250" name="teleporthistory"
+                rect_control="FloaterTeleportHistoryRect" title="Teleport History">
+        <tab_container label="TPlistTabs" bottom="40" height="185" left="5" follows="left|top|right|bottom" mouse_opaque="false" name="tplisttabs"
+             tab_min_width="50" tab_position="top" width="480" right="-10" bg_opaque_color="0,0,0,0.0">
+                <panel border="true" bottom="-185" follows="left|top|right|bottom" height="185"
+                                 label="Teleported to" left="2" mouse_opaque="true" name="TP-in" width="455">
+        <scroll_list background_visible="true" draw_border="true" draw_stripes="true"
+                                draw_heading="true" follows="left|top|right|bottom" left="2" right="-2" top="5" width="450"
+                                height="175" bottom_delta="-177" multi_select="false" name="places_list_in">
+                <column dynamicwidth="true" label="Region" name="region" />
+                <column width="100" label="Position" name="position" />
+                <column dynamicwidth="true" label="Visited" name="visited" />
+                <!--Hidden fields, used as storage for prebuilt strings, please keep at width 0-->
+                <column width="0" label="SLURL" name="slurl" />
+                <column width="0" label="Sim String" name="simstring" />
+        </scroll_list>
+                </panel>
+                <panel border="true" bottom="-185" follows="left|top|right|bottom" height="185"
+                                 label="Teleported from" left="2" mouse_opaque="true" name="TP-out" width="455">
+                        <scroll_list background_visible="true" draw_border="true" draw_stripes="true"
+                                draw_heading="true" follows="left|top|right|bottom" left="2" right="-2" top="5" width="450"
+                                height="175" bottom_delta="-177" multi_select="false" name="places_list_out">
+                                <column dynamicwidth="true" label="Region" name="region" />
+                                <column width="100" label="Position" name="position" />
+                                <column dynamicwidth="true" label="Visited" name="visited" />
+                                <!--Hidden fields, used as storage for prebuilt strings, please keep at width 0-->
+                                <column width="0" label="SLURL" name="slurl" />
+                                <column width="0" label="Sim String" name="simstring" />
+                        </scroll_list>
+                </panel>
+        </tab_container>
+        <button
+                bottom_delta="-24" enabled="false" follows="left|bottom" font="SansSerif" halign="center"
+                width="90" height="20" label="Teleport" label_selected="Teleport"
+                left="10" mouse_opaque="true" name="teleport" tool_tip="Teleport to selected location" />
+        <button bottom_delta="0" enabled="false" follows="left|bottom" font="SansSerif" halign="center"
+                height="20" label="Show On Map" label_selected="Show On Map"
+                left_delta="100" mouse_opaque="true" name="show_on_map"
+                tool_tip="Center map on this location" width="125" />
+        <button bottom_delta="0" enabled="true" follows="left|bottom" font="SansSerif" halign="center"
+                height="20" label="Clear History"
+                left_delta="135" mouse_opaque="true" name="clear_history"
+                tool_tip="Clear Saved Teleport History" width="125" />
+        <button bottom_delta="0" enabled="false" follows="bottom|right" font="SansSerif"
+                height="20" label="Copy SLURL to clipboard" left="-190" name="copy_slurl"
+                tool_tip="Copies current location as SLURL to be used on the web."
+                width="182" />
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml b/linden/indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml
index 97b12e0..f42ed9f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-516" can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="true" can_tear_off="true" enabled="true" height="290"
+     can_resize="true" can_tear_off="true" enabled="true" height="330"
-     left="478" min_height="290" min_width="410" mouse_opaque="true"
+     left="478" min_height="330" min_width="460" mouse_opaque="true"
-     name="texture picker" title="Pick: Texture" width="410">
+     name="texture picker" title="Pick: Texture" width="460">
        <string name="choose_picture">
                Click to choose a picture
        </string>
@@ -30,31 +30,77 @@
        <button bottom="-252" enabled="false" follows="left|bottom" font="SansSerifSmall"
             halign="center" height="20" label="Invisible" label_selected="Invisible" left="72"
             mouse_opaque="true" name="Invisible" scale_image="true" width="64" />
-        <check_box bottom="-44" enabled="true" follows="left|top" font="SansSerifSmall"
-             height="24" initial_value="true" label="Show Folders" left="175"
+        <check_box bottom="-305" enabled="true" follows="left|bottom" font="SansSerifSmall"
+             height="20" initial_value="true" label="Show Folders" left="4"
             mouse_opaque="true" name="show_folders_check" radio_style="false"
-             width="201" />
+             width="150" />
-        <search_editor bottom="-36" enabled="true" follows="left|top|right" height="16"
-             label="Type here to search" left="175" mouse_opaque="true"
+        <check_box bottom="-322" enabled="true" follows="left|bottom" font="SansSerifSmall"
-             name="inventory search editor" width="231" />
-        <inventory_panel allow_multi_select="false" border="true" bottom="-256" enabled="true"
-             follows="left|top|right|bottom" height="216" left="175" mouse_opaque="true"
-             name="inventory panel" sort_order="TexturePickerSortOrder" width="231" />
-        <check_box bottom="-282" enabled="true" follows="left|bottom" font="SansSerifSmall"
             height="20" initial_value="true" label="Apply Immediately" left="4"
             mouse_opaque="true" name="apply_immediate_check" radio_style="false"
             width="150" />
-        <button bottom="-282" enabled="true" follows="left|bottom" font="SansSerif"
+        <button bottom="-322" enabled="true" follows="left|bottom" font="SansSerif"
             halign="center" height="32" image_selected="eye_button_active.tga"
             image_unselected="eye_button_inactive.tga" label="" label_selected=""
             left="139" mouse_opaque="true" name="Pipette" scale_image="true" width="32" />
-        <button bottom="-282" enabled="true" follows="right|bottom" font="SansSerif"
+        <button bottom="-322" enabled="true" follows="right|bottom" font="SansSerif"
             halign="center" height="20" label="Cancel" label_selected="Cancel"
-             left="186" mouse_opaque="true" name="Cancel" scale_image="true" width="100" />
+             left="176" mouse_opaque="true" name="Cancel" scale_image="true" width="100" />
-        <button bottom="-282" enabled="true" follows="right|bottom" font="SansSerif"
+        <button bottom="-322" enabled="true" follows="right|bottom" font="SansSerif"
             halign="center" height="20" label="Select" label_selected="Select"
-             left="290" mouse_opaque="true" name="Select" scale_image="true" width="100" />
+             left="280" mouse_opaque="true" name="Select" scale_image="true" width="100" />
        <string name="pick title">
-                Pick:
+                Pick:  
        </string>
+        <tab_container border="false" bottom_delta="0" width="410" height="300" left="175" mouse_opaque="false" name="actions_tab_container" tab_position="top" follows="left|top|right|bottom">
+    <panel border="false" bottom_delta="0" follows="right|top" height="300" label="Inventory" left="0" mouse_opaque="false" name="server_tab" width="410">
+        <search_editor bottom_delta="-20" enabled="true" follows="left|top|right" height="16"
+                 label="Type here to search" left="0" mouse_opaque="true"
+                 name="inventory search editor" width="271" />
+        <inventory_panel allow_multi_select="false" border="true" bottom="-270" enabled="true"
+                 follows="left|top|right|bottom" height="245" left="0" mouse_opaque="true"
+                 name="inventory panel" sort_order="TexturePickerSortOrder" width="271" />
+    </panel>
+    <panel border="false" bottom_delta="0" follows="left|top" height="300" label="Computer" left="175" mouse_opaque="false" name="local_tab" width="410">
+  <!-- tag: vaa emerald local_asset_browser [begin] -->
+      <text 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="14" left="4"
+           mouse_opaque="true" name="select_local" v_pad="0" width="400">
+        Select texture on your computer to preview inworld
+      </text>
+      <button bottom_delta="-22" enabled="true" follows="left|top" 
+              font="SansSerifSmall" halign="center" height="20" 
+              label="Add" left="4" mouse_opaque="true" 
+              name="Add" scale_image="true" width="70" visible="true" />
+      <button bottom_delta="0" enabled="true" follows="left|top" 
+              font="SansSerifSmall" halign="center" height="20" 
+              label="Remove" left_delta="73" mouse_opaque="true" 
+              name="Remove" scale_image="true" width="70" visible="true" />
+      <button bottom_delta="0" enabled="true" follows="left|top" 
+              font="SansSerifSmall" halign="center" height="20" 
+              label="Properties..." left_delta="103" mouse_opaque="true" 
+              name="Browser" scale_image="true" width="90" visible="true" />
+      <scroll_list
+              name="local_name_list"
+              left="0"
+              bottom="-270"
+              width="271"
+              height="225"
+              follows="left|top|right|bottom"
+              column_padding="0"
+              can_resize="false"
+              draw_heading="true"
+              multi_select="true"
+              search_column="1"
+              visible="true"
+                        >
+              <column name="unit_name" label="Name" dynamicwidth="true" />
+              <column name="unit_id_HIDDEN" label="ID" width="0" />
+            </scroll_list>
+          <!-- tag: vaa emerald local_asset_browser [end] -->
+    </panel>
+  </tab_container>
 </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 7673607..3f476cf 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-374" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" follows="left|top" height="565" 
+     can_resize="false" follows="left|top" height="575" 
     left="308" min_height="100" min_width="100" mouse_opaque="true"
     name="toolbox floater" rect_control="ToolboxRect" sound_flags="0" title=""
     short_title="Build" width="272">
@@ -79,6 +79,10 @@
        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
             initial_value="false" label="Select faces to texture" left="4" mouse_opaque="true"
             name="radio select face" radio_style="true" width="114" />
+        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Align (Shift to Pack)" left="4" mouse_opaque="true"
+             name="radio align" radio_style="true" width="114"
+       tool_tip="Align aligns all selected prims' edges along an axis, Pack moves all selected prims' edges so they're touching" />
        <check_box bottom_delta="-19" control_name="EditLinkedParts" follows="left|top"
             font="SansSerifSmall" height="16" initial_value="false"
             label="Edit linked parts" left="4" mouse_opaque="true"
@@ -321,10 +325,16 @@
       mouse_opaque="true" name="prim_count" v_pad="0" width="143">
    Primitives: [COUNT]
  </text>
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom="-168" left="118" drop_shadow_visible="true" follows="left|top"
+     font="SansSerifSmall" h_pad="0" halign="right" height="16"
+     mouse_opaque="true" name="link_num" v_pad="0" width="143">
+    Link number: [NUMBER]
+  </text>
 <!-- Sub-tabs -->
-        <tab_container bottom="-565" follows="left|top" height="384" left="0" mouse_opaque="false"
+        <tab_container bottom="-575" follows="left|top" height="384" left="0" mouse_opaque="false"
             name="Object Info Tabs" tab_max_width="52" tab_min_width="40"
             tab_position="top" width="272">
                <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
@@ -348,7 +358,8 @@
                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-46"
                             follows="left|top|right" font="SansSerifSmall" height="16" left="88"
                             max_length="127" mouse_opaque="true" name="Object Description"
-                             select_all_on_focus_received="true" width="172" />
+                             select_all_on_focus_received="true" width="172" spell_check="true" />
+      
                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-66" drop_shadow_visible="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
@@ -358,29 +369,25 @@
                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-66" drop_shadow_visible="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
-                             mouse_opaque="true" name="Creator Name" v_pad="0" width="88">
+                             mouse_opaque="true" name="Creator Name" v_pad="0" width="145"
-                                Thrax Linden
+           hover="true" hover_color="50 115 185" font-style="UNDERLINE">
-                        </text>
+        Imprudent Linden
-                        <button bottom="-66" follows="top|right" font="SansSerifSmall" halign="center"
+      </text>
-                             height="20" label="Profile..." label_selected="Profile..." left_delta="94"
-                             mouse_opaque="true" name="button creator profile" scale_image="TRUE"
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             width="78" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-86" drop_shadow_visible="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
                             mouse_opaque="true" name="Owner:" v_pad="0" width="78">
-                                Owner:
+        Owner:
-                        </text>
+      </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-86" drop_shadow_visible="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
-                             mouse_opaque="true" name="Owner Name" v_pad="0" width="88">
+                             mouse_opaque="true" name="Owner Name" v_pad="0" width="174"
-                                Thrax Linden
+           hover="true" hover_color="50 115 185" font-style="UNDERLINE">
-                        </text>
+        Imprudent Linden
-                        <button bottom="-86" follows="top|right" font="SansSerifSmall" halign="center"
+      </text>
-                             height="20" label="Profile..." label_selected="Profile..." left_delta="94"
+      
-                             mouse_opaque="true" name="button owner profile" scale_image="TRUE"
-                             width="78" />
      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
@@ -390,24 +397,22 @@
      <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="78"
-                             mouse_opaque="true" name="Last Owner Name" v_pad="0" width="88">
+                             mouse_opaque="true" name="Last Owner Name" v_pad="0" width="174"
-        Thrax Linden
+           hover="true" hover_color="50 115 185" font-style="UNDERLINE">
+        Imprudent Linden
      </text>
-      <button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
-                             height="20" label="Profile..." label_selected="Profile..." left_delta="94"
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             mouse_opaque="true" name="button last owner profile" scale_image="TRUE"
-                             width="78" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-126" drop_shadow_visible="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
                             mouse_opaque="true" name="Group:" v_pad="0" width="78">
-                                Group:
+        Group:
-                        </text>
+      </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-126" drop_shadow_visible="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
                             mouse_opaque="true" name="Group Name Proxy" v_pad="0" visible="false"
-                             width="88">
+                             width="88" hover="true" hover_color="50 115 185" font-style="UNDERLINE">
                                The Lindens
                        </text>
                        <button bottom="-126" follows="top|right" font="SansSerifSmall" halign="center"
@@ -441,42 +446,52 @@
                             mouse_opaque="true" name="button deed" scale_image="TRUE"
                             tool_tip="Group shared objects can be deeded by a group officer."
                             width="78" />
-                        <check_box bottom="-206" follows="left|top" font="SansSerifSmall" height="16"
+      <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Allow anyone to move" left="10"
-                             mouse_opaque="true" name="checkbox allow everyone move" width="142" />
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Allow anyone to copy" left="10"
-                             mouse_opaque="true" name="checkbox allow everyone copy" width="141" />
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
                             initial_value="false" label="Show in search" left="10" name="search_check"
                             tool_tip="Let people see this object in search results" width="78" />
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+      <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
                             initial_value="false" label="For sale:" left="10" mouse_opaque="true"
                             name="checkbox for sale" width="78" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <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="90"
                             mouse_opaque="true" name="Cost" v_pad="0" width="78">
-                                Price: [CURRENCY]
+        Price: [CURRENCY]
-                        </text>
+      </text>
-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
                             follows="left|top|right" font="SansSerifSmall" height="16" left_delta="80"
                             max_length="25" mouse_opaque="true" name="Edit Cost" width="75" />
-                        <radio_group bottom="-286" draw_border="false" follows="left|top|right" height="16"
+      <radio_group bottom_delta="-20" 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"
+        <radio_item bottom="-16" follows="left|top" height="16" left="0" mouse_opaque="true"
                                     name="Original" width="70">
-                                        Original
+          Original
-                                </radio_item>
+        </radio_item>
-                                <radio_item bottom="-16" follows="left|top" height="16" left="70" mouse_opaque="true"
+        <radio_item bottom="-16" follows="left|top" height="16" left="70" mouse_opaque="true"
                                     name="Copy" width="70">
-                                        Copy
+          Copy
-                                </radio_item>
+        </radio_item>
-                                <radio_item bottom="-16" follows="left|top" height="16" left="140" mouse_opaque="true"
+        <radio_item bottom="-16" follows="left|top" height="16" left="140" mouse_opaque="true"
                                     name="Contents" width="76">
-                                        Contents
+          Contents
-                                </radio_item>
+        </radio_item>
-                        </radio_group>
+      </radio_group>
+      <button bottom="-358" follows="top|right" font="SansSerifSmall" halign="center"
+             height="20" label="Copy Key" label_selected="Copy Key" right="-10"
+             mouse_opaque="true" name="button copy key" width="78"
+             tool_tip="Copies an object's key(s) to the clipboard" />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+           bottom="-262" drop_shadow_visible="true" follows="left|top|right"
+           font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+           mouse_opaque="true" name="Anyone can:" v_pad="0" width="250">
+        Anyone Can:
+      </text>
+      <check_box bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="16"
+           initial_value="false" label="Move" left="10"
+           mouse_opaque="true" name="checkbox allow everyone move" width="142" />
+      <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+                             initial_value="false" label="Copy" left_delta="60"
+                             mouse_opaque="true" name="checkbox allow everyone copy" width="141" />
                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-298" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
@@ -644,6 +659,16 @@
                             increment="0.01" initial_val="0" label="Z" label_width="10" left="10"
                             max_val="4096" min_val="0" mouse_opaque="true" name="Pos Z"
                             text_enabled_color="0, 67, 132, 255" width="96" />
+      <button bottom_delta="36" follows="top|right" font="SansSerifSmall" halign="center"
+       height="18" label="C" left_delta="90" mouse_opaque="true" name="copypos" enabled="true"
+       tool_tip="Copy Position"  width="20" />
+      <button bottom_delta="-18" follows="top|right" font="SansSerifSmall" halign="center"
+       height="18" label="P" left_delta="0" mouse_opaque="true" name="pastepos"  enabled="true"
+       tool_tip="Paste Position"  width="20" />
+      <button bottom_delta="-18" follows="top|right" font="SansSerifSmall" halign="center"
+       height="18" label="p" left_delta="0" mouse_opaque="true" name="pasteposclip"  enabled="true"
+       tool_tip="Paste Position from Clipboard"  width="20" />
      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
@@ -662,6 +687,16 @@
                             increment="0.01" initial_val="0" label="Z" label_width="10" left="10"
                             mouse_opaque="true" name="Scale Z"
                             text_enabled_color="1, 1, 1, 1" width="96" />
+      <button bottom_delta="36" follows="top|right" font="SansSerifSmall" halign="center"
+       height="18" label="C" left_delta="90" mouse_opaque="true" name="copysize"  enabled="true"
+       tool_tip="Copy Size"  width="20" />
+      <button bottom_delta="-18" follows="top|right" font="SansSerifSmall" halign="center"
+       height="18" label="P" left_delta="0" mouse_opaque="true" name="pastesize"  enabled="true"
+       tool_tip="Paste Size"  width="20" />
+      <button bottom_delta="-18" follows="top|right" font="SansSerifSmall" halign="center"
+       height="18" label="p" left_delta="0" mouse_opaque="true" name="pastesizeclip"  enabled="true"
+       tool_tip="Paste Size from Clipboard"  width="20" />
      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
@@ -680,6 +715,16 @@
                             increment="1" initial_val="0" label="Z" label_width="10" left="10"
                             max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Z"
                             text_enabled_color="1, 1, 1, 1" width="96" />
+      <button bottom_delta="36" follows="top|right" font="SansSerifSmall" halign="center"
+       height="18" label="C" left_delta="90" mouse_opaque="true" name="copyrot"  enabled="true"
+       tool_tip="Copy Rotation"  width="20" />
+      <button bottom_delta="-18" follows="top|right" font="SansSerifSmall" halign="center"
+       height="18" label="P" left_delta="0" mouse_opaque="true" name="pasterot"  enabled="true"
+       tool_tip="Paste Rotation"  width="20" />
+      <button bottom_delta="-18" follows="top|right" font="SansSerifSmall" halign="center"
+       height="18" label="p" left_delta="0" mouse_opaque="true" name="pasterotclip"  enabled="true"
+       tool_tip="Paste Rotation from Clipboard"  width="20" />
      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
@@ -863,12 +908,12 @@
                                Slice Begin and End:
                        </text>
                        <spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.025" initial_val="0" label="B" label_width="10" left="121"
+                             increment="0.02" initial_val="0" label="B" label_width="10" left="121"
-                             max_val="0.95" min_val="0" mouse_opaque="true" name="Path Limit Begin"
+                             max_val="0.98" min_val="0" mouse_opaque="true" name="Path Limit Begin"
                             width="68" />
                        <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.025" initial_val="1" label="E" label_width="10" left_delta="73"
+                             increment="0.02" initial_val="1" label="E" label_width="10" left_delta="73"
-                             max_val="1" min_val="0.05" mouse_opaque="true" name="Path Limit End"
+                             max_val="1" min_val="0.02" mouse_opaque="true" name="Path Limit End"
                             width="68" />
                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
@@ -1050,7 +1095,7 @@
        Glow:
      </text>
                        <spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
-                             increment="0.1" initial_val="0" left="180" max_val="1"
+                             increment="0.05" initial_val="0" left="180" max_val="1"
                             min_val="0" mouse_opaque="true" name="glow" width="58" />
                        <check_box bottom_delta="-23" follows="left|top" font="SansSerifSmall" height="16"
                             initial_value="false" label="Full bright" left="180" mouse_opaque="true"
@@ -1167,13 +1212,13 @@
                             mouse_opaque="true" name="tex scale" v_pad="0" width="160">
        Repeats Per Face:
      </text>
-      <spinner bottom="-178" decimal_digits="3" follows="left|top" height="16" increment="0.1"
+      <spinner bottom="-178" decimal_digits="3" follows="left|top" height="16" increment="0.05"
                             initial_val="0" label="Horizontal (U):" label_width="90" left="20"
                             max_val="10000" min_val="0" mouse_opaque="true" name="TexScaleU" width="160" />
                        <check_box bottom="-179" follows="left|top" font="SansSerifSmall" height="16"
                             initial_value="false" label="Flip" left_delta="170" mouse_opaque="true"
                             name="checkbox flip s" width="70" />
-                        <spinner bottom="-196" decimal_digits="3" follows="left|top" height="16" increment="0.1"
+                        <spinner bottom="-196" decimal_digits="3" follows="left|top" height="16" increment="0.05"
                             initial_val="0" label="Vertical (V):" label_width="90" left="20"
                             max_val="10000" min_val="0" mouse_opaque="true" name="TexScaleV" width="160" />
                        <check_box bottom="-197" follows="left|top" font="SansSerifSmall" height="16"
@@ -1212,11 +1257,11 @@
                             mouse_opaque="true" name="tex offset" v_pad="0" width="160">
        Offset:
      </text>
-                        <spinner bottom="-308" decimal_digits="3" follows="left|top" height="16" increment="0.1"
+                        <spinner bottom="-308" decimal_digits="3" follows="left|top" height="16" increment="0.05"
                             initial_val="0" label="Horizontal (U):" label_width="90" left="20"
                             max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetU" width="160" />
                        <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.1" initial_val="0" label="Vertical (V):" label_width="90"
+                             increment="0.05" initial_val="0" label="Vertical (V):" label_width="90"
                             left="20" max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetV"
                             width="160" />
                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -1318,6 +1363,9 @@
        <string name="status_move">
                Drag to Move, Shift-Drag to Copy
        </string>
+  <string name="status_align">
+    CTRL-A to align on an axis, CTRL-Shift-A to Pack 
+  </string>
        <string name="status_modifyland">
                Click and Hold to Modify Land
        </string>
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 485cfcc..beea02f 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
@@ -15,15 +15,14 @@
             bottom="-50" drop_shadow_visible="true" follows="left|top" font="SansSerif"
             h_pad="0" halign="left" height="30" left="16" 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,
+                Please read the following Terms of Service carefully. To continue logging in you must accept the agreement.
-you must accept the agreement.
        </text>
-        <text_editor bottom="-376" embedded_items="false" follows="left|top" font="SansSerif"
+  <text_editor bottom="-376" embedded_items="false" follows="left|top" font="SansSerif"
             height="283" left="16" max_length="65536" mouse_opaque="true"
             name="tos_text" width="568"
             word_wrap="true">
-                TOS_TEXT
+    TOS_TEXT
-        </text_editor>
+  </text_editor>
  <!-- Loading text says: "Loading Terms of Service..." URL encoded -->
        <web_browser bottom="-406" embedded_items="false" follows="left|top" font="SansSerif"
             height="340" left="16" max_length="65536" mouse_opaque="true"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_water.xml b/linden/indra/newview/skins/default/xui/en-us/floater_water.xml
index 7038c93..a05deb6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_water.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_water.xml
@@ -1,266 +1,276 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true"
+<floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="240" left="50" min_height="200"
+     can_resize="false" height="240" left="50" min_height="200"
-     min_width="400" mouse_opaque="true" name="Water Floater"
+     min_width="400" mouse_opaque="true" name="Water Floater"
-     rect_control="FloaterAdvancedWaterRect" title="Advanced Water Editor"
+     rect_control="FloaterAdvancedWaterRect" title="Advanced Water Editor"
-     width="700">
+     width="700">
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-50" drop_shadow_visible="true" follows="left|top|right"
+             bottom="-50" drop_shadow_visible="true" follows="left|top|right"
-             font="SansSerif" h_pad="0" halign="left" height="16"
+             font="SansSerif" h_pad="0" halign="left" height="16"
-             left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0"
+             left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0"
-             width="110">
+             width="110">
-                Water Presets:
+                Water Presets:
-        </text>
+        </text>
-        <combo_box allow_text_entry="false" bottom="-52" follows="left|top" height="18"
+        <combo_box allow_text_entry="false" bottom="-52" follows="left|top" height="18"
-             left_delta="120" max_chars="20" mouse_opaque="true"
+             left_delta="120" max_chars="20" mouse_opaque="true"
-             name="WaterPresetsCombo" width="150" />
+             name="WaterPresetsCombo" width="150" />
-  <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
+  <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-             label="" label_selected="" left_delta="-25" image_overlay="arrow_left.tga"
+             label="" label_selected="" left_delta="-25" image_overlay="arrow_left.tga"
-             mouse_opaque="true" name="prev" scale_image="true" width="20" />
+             mouse_opaque="true" name="prev" scale_image="true" width="20" />
-  <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
+  <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-             label="" label_selected="" left_delta="180" image_overlay="arrow_right.tga"
+             label="" label_selected="" left_delta="180" image_overlay="arrow_right.tga"
-             mouse_opaque="true" name="next" scale_image="true" width="20" />
+             mouse_opaque="true" name="next" scale_image="true" width="20" />
-        <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
+        <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-             label="New" label_selected="New" left_delta="40"
+             label="New" right="-270"
-             mouse_opaque="true" name="WaterNewPreset" scale_image="true" width="70" />
+       mouse_opaque="true" name="WaterNewPreset" scale_image="true" width="100" />
-        <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
+  <flyout_button bottom_delta="0" follows="left|top" height="20" label="Save to Disk"
-             label="Save" label_selected="Save" left_delta="70"
+       right="-140" halign="center" list_position="above" enabled="true" 
-             mouse_opaque="true" name="WaterSavePreset" scale_image="true" width="70" />
+       mouse_opaque="true" width="125"  name="WaterSavePreset">
-        <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
+    <flyout_button_item value="save_inventory_item" name="save_inventory_item">
-             label="Delete" label_selected="Delete" left_delta="70"
+      Save to Inventory
-             mouse_opaque="true" name="WaterDeletePreset" scale_image="true" width="70" />
+    </flyout_button_item>
-        <tab_container bottom="-240" follows="left|top" height="180" left="0"
+    <flyout_button_item value="save_disk_item" name="save_disk_item">
-             mouse_opaque="false" name="Water Tabs" tab_position="top" width="700">
+      Save to Disk
-                <panel border="true" bottom="-240" follows="left|top|right|bottom" height="180"
+    </flyout_button_item>
-                     label="Settings" left="1" mouse_opaque="false"
+    <flyout_button_item value="send_to_server_item" name="send_to_server_item">
-                     name="Settings" width="698">
+      Send to Server
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+    </flyout_button_item>
-                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
+  </flyout_button>
-                             font="SansSerif" h_pad="0" halign="left" height="16"
+        <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-                             left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">
+             label="Delete File" label_selected="Delete File" right="-10"
-                                Water Fog Color
+             mouse_opaque="true" name="WaterDeletePreset" scale_image="true" width="125" />
-                        </text>
+        <tab_container bottom="-240" follows="left|top" height="180" left="0"
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+             mouse_opaque="false" name="Water Tabs" tab_position="top" width="700">
-                             left="160" name="WaterFogColorHelp" width="18" />
+                <panel border="true" bottom="-240" follows="left|top|right|bottom" height="180"
-                        <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-80"
+                     label="Settings" left="1" mouse_opaque="false"
-                             can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top"
+                     name="Settings" width="698">
-                             height="50" label="" left="40" mouse_opaque="true"
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             name="WaterFogColor" tool_tip="Click to open Color Picker" width="40" />
+                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             bottom="-90" drop_shadow_visible="true" follows="left|top|right"
+                             left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">
-                             font="SansSerif" h_pad="0" halign="left" height="16"
+                                Water Fog Color
-                             left="10" mouse_opaque="true" name="WaterFogDensText" v_pad="0" width="355">
+                        </text>
-                                Fog Density Exponent
+                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-                        </text>
+                             left="160" name="WaterFogColorHelp" width="18" />
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+                        <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-80"
-                             left="160" name="WaterFogDensityHelp" width="18" />
+                             can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top"
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WaterFogDensity"
+                             height="50" label="" left="40" mouse_opaque="true"
-                             decimal_digits="1" follows="left" height="10" increment=".1"
+                             name="WaterFogColor" tool_tip="Click to open Color Picker" width="40" />
-                             initial_val="16" label="" left="24" max_val="10" min_val="0"
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             mouse_opaque="true" name="WaterFogDensity" show_text="true" value="1.0"
+                             bottom="-90" drop_shadow_visible="true" follows="left|top|right"
-                             width="200" />
+                             font="SansSerif" h_pad="0" halign="left" height="16"
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             left="10" mouse_opaque="true" name="WaterFogDensText" v_pad="0" width="355">
-                             bottom="-130" drop_shadow_visible="true" follows="left|top|right"
+                                Fog Density Exponent
-                             font="SansSerif" h_pad="0" halign="left" height="16"
+                        </text>
-                             left="10" mouse_opaque="true" name="WaterUnderWaterFogModText" v_pad="0"
+                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-                             width="355">
+                             left="160" name="WaterFogDensityHelp" width="18" />
-                                Underwater Fog Modifier
+                        <slider bottom_delta="-30" can_edit_text="false" control_name="WaterFogDensity"
-                        </text>
+                             decimal_digits="1" follows="left" height="10" increment=".1"
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+                             initial_val="16" label="" left="24" max_val="10" min_val="0"
-                             left="160" name="WaterUnderWaterFogModHelp" width="18" />
+                             mouse_opaque="true" name="WaterFogDensity" show_text="true" value="1.0"
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="" decimal_digits="2"
+                             width="200" />
-                             follows="left" height="10" increment=".01" initial_val="16" label=""
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             left="24" max_val="2" min_val="0" mouse_opaque="true"
+                             bottom="-130" drop_shadow_visible="true" follows="left|top|right"
-                             name="WaterUnderWaterFogMod" show_text="true" value="0.25" width="200" />
+                             font="SansSerif" h_pad="0" halign="left" height="16"
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             left="10" mouse_opaque="true" name="WaterUnderWaterFogModText" v_pad="0"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
+                             width="355">
-                             font="SansSerif" h_pad="0" halign="left" height="16"
+                                Underwater Fog Modifier
-                             left="245" mouse_opaque="true" name="BDensText" v_pad="0" width="355">
+                        </text>
-                                Reflection Wavelet Scale
+                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-                        </text>
+                             left="160" name="WaterUnderWaterFogModHelp" width="18" />
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+                        <slider bottom_delta="-30" can_edit_text="false" control_name="" decimal_digits="2"
-                             left="395" name="WaterNormalScaleHelp" width="18" />
+                             follows="left" height="10" increment=".01" initial_val="16" label=""
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             left="24" max_val="2" min_val="0" mouse_opaque="true"
-                             bottom="-37" drop_shadow_visible="true" follows="left|top|right"
+                             name="WaterUnderWaterFogMod" show_text="true" value="0.25" width="200" />
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             left="245" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
+                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                                1
+                             font="SansSerif" h_pad="0" halign="left" height="16"
-                        </text>
+                             left="245" mouse_opaque="true" name="BDensText" v_pad="0" width="355">
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                                Reflection Wavelet Scale
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+                        </text>
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
+                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-                             left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
+                             left="395" name="WaterNormalScaleHelp" width="18" />
-                                2
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                        </text>
+                             bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+                             left="245" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
+                                1
-                             left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
+                        </text>
-                                3
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                        </text>
+                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                        <slider bottom="-50" can_edit_text="false" control_name="WaterNormalScaleX"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             decimal_digits="1" follows="left" height="10" increment="0.1"
+                             left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
-                             initial_val="0.7" label="" left="259" max_val="10" min_val="0"
+                                2
-                             mouse_opaque="true" name="WaterNormalScaleX" show_text="true" value="1.0"
+                        </text>
-                             width="200" />
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WaterNormalScaleY"
+                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             decimal_digits="1" follows="left" height="10" increment="0.1"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             initial_val="0.7" label="" left="259" max_val="10" min_val="0"
+                             left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
-                             mouse_opaque="true" name="WaterNormalScaleY" show_text="true" value="1.0"
+                                3
-                             width="200" />
+                        </text>
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WaterNormalScaleZ"
+                        <slider bottom="-50" can_edit_text="false" control_name="WaterNormalScaleX"
-                             decimal_digits="1" follows="left" height="10" increment="0.1"
+                             decimal_digits="1" follows="left" height="10" increment="0.1"
-                             initial_val="0.7" label="" left="259" max_val="10" min_val="0"
+                             initial_val="0.7" label="" left="259" max_val="10" min_val="0"
-                             mouse_opaque="true" name="WaterNormalScaleZ" show_text="true" value="1.0"
+                             mouse_opaque="true" name="WaterNormalScaleX" show_text="true" value="1.0"
-                             width="200" />
+                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                        <slider bottom_delta="-11" can_edit_text="false" control_name="WaterNormalScaleY"
-                             bottom="-80" drop_shadow_visible="true" follows="left|top|right"
+                             decimal_digits="1" follows="left" height="10" increment="0.1"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
+                             initial_val="0.7" label="" left="259" max_val="10" min_val="0"
-                             left="245" mouse_opaque="true" name="HDText" v_pad="0" width="355">
+                             mouse_opaque="true" name="WaterNormalScaleY" show_text="true" value="1.0"
-                                Fresnel Scale
+                             width="200" />
-                        </text>
+                        <slider bottom_delta="-11" can_edit_text="false" control_name="WaterNormalScaleZ"
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+                             decimal_digits="1" follows="left" height="10" increment="0.1"
-                             left="395" name="WaterFresnelScaleHelp" width="18" />
+                             initial_val="0.7" label="" left="259" max_val="10" min_val="0"
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WaterFresnelScale"
+                             mouse_opaque="true" name="WaterNormalScaleZ" show_text="true" value="1.0"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
+                             width="200" />
-                             initial_val="0.7" label="" left="259" max_val="1" min_val="0"
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             mouse_opaque="true" name="WaterFresnelScale" show_text="true" value="1.0"
+                             bottom="-80" drop_shadow_visible="true" follows="left|top|right"
-                             width="200" />
+                             font="SansSerif" h_pad="0" halign="left" height="16"
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             left="245" mouse_opaque="true" name="HDText" v_pad="0" width="355">
-                             bottom="-115" drop_shadow_visible="true" follows="left|top|right"
+                                Fresnel Scale
-                             font="SansSerif" h_pad="0" halign="left" height="16"
+                        </text>
-                             left="245" mouse_opaque="true" name="FresnelOffsetText" v_pad="0"
+                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-                             width="355">
+                             left="395" name="WaterFresnelScaleHelp" width="18" />
-                                Fresnel Offset
+                        <slider bottom_delta="-30" can_edit_text="false" control_name="WaterFresnelScale"
-                        </text>
+                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+                             initial_val="0.7" label="" left="259" max_val="1" min_val="0"
-                             left="395" name="WaterFresnelOffsetHelp" width="18" />
+                             mouse_opaque="true" name="WaterFresnelScale" show_text="true" value="1.0"
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WaterFresnelOffset"
+                             width="200" />
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             initial_val="0.7" label="" left="259" max_val="1" min_val="0"
+                             bottom="-115" drop_shadow_visible="true" follows="left|top|right"
-                             mouse_opaque="true" name="WaterFresnelOffset" show_text="true" value="1.0"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             width="200" />
+                             left="245" mouse_opaque="true" name="FresnelOffsetText" v_pad="0"
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             width="355">
-                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
+                                Fresnel Offset
-                             font="SansSerif" h_pad="0" halign="left" height="16"
+                        </text>
-                             left="480" mouse_opaque="true" name="DensMultText" v_pad="0" width="355">
+                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-                                Refract Scale Above
+                             left="395" name="WaterFresnelOffsetHelp" width="18" />
-                        </text>
+                        <slider bottom_delta="-30" can_edit_text="false" control_name="WaterFresnelOffset"
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             left="630" name="WaterScaleAboveHelp" width="18" />
+                             initial_val="0.7" label="" left="259" max_val="1" min_val="0"
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WaterScaleAbove"
+                             mouse_opaque="true" name="WaterFresnelOffset" show_text="true" value="1.0"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
+                             width="200" />
-                             initial_val="0.1" label="" left="494" max_val="1" min_val="0"
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             mouse_opaque="true" name="WaterScaleAbove" show_text="true" value="1.0"
+                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             width="200" />
+                             font="SansSerif" h_pad="0" halign="left" height="16"
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             left="480" mouse_opaque="true" name="DensMultText" v_pad="0" width="355">
-                             bottom="-53" drop_shadow_visible="true" follows="left|top|right"
+                                Refract Scale Above
-                             font="SansSerif" h_pad="0" halign="left" height="16"
+                        </text>
-                             left="480" mouse_opaque="true" name="WaterScaleBelowText" v_pad="0"
+                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-                             width="355">
+                             left="630" name="WaterScaleAboveHelp" width="18" />
-                                Refract Scale Below
+                        <slider bottom_delta="-30" can_edit_text="false" control_name="WaterScaleAbove"
-                        </text>
+                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+                             initial_val="0.1" label="" left="494" max_val="1" min_val="0"
-                             left="630" name="WaterScaleBelowHelp" width="18" />
+                             mouse_opaque="true" name="WaterScaleAbove" show_text="true" value="1.0"
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WaterScaleBelow"
+                             width="200" />
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             initial_val="0" label="" left="494" max_val="1" min_val="0"
+                             bottom="-53" drop_shadow_visible="true" follows="left|top|right"
-                             mouse_opaque="true" name="WaterScaleBelow" show_text="true" value="0.0"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             width="200" />
+                             left="480" mouse_opaque="true" name="WaterScaleBelowText" v_pad="0"
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             width="355">
-                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
+                                Refract Scale Below
-                             font="SansSerif" h_pad="0" halign="left" height="16"
+                        </text>
-                             left="480" mouse_opaque="true" name="MaxAltText" v_pad="0" width="355">
+                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-                                Blur Multiplier
+                             left="630" name="WaterScaleBelowHelp" width="18" />
-                        </text>
+                        <slider bottom_delta="-30" can_edit_text="false" control_name="WaterScaleBelow"
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             left="630" name="WaterBlurMultiplierHelp" width="18" />
+                             initial_val="0" label="" left="494" max_val="1" min_val="0"
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WaterBlurMult"
+                             mouse_opaque="true" name="WaterScaleBelow" show_text="true" value="0.0"
-                             decimal_digits="3" follows="left" height="10" increment=".001"
+                             width="200" />
-                             initial_val="0" label="" left="494" max_val=".16" min_val="0"
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             mouse_opaque="true" name="WaterBlurMult" show_text="true" value="0"
+                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                             width="200" />
+                             font="SansSerif" h_pad="0" halign="left" height="16"
-                </panel>
+                             left="480" mouse_opaque="true" name="MaxAltText" v_pad="0" width="355">
-                <panel border="true" bottom="-240" follows="left|top|right|bottom" height="180"
+                                Blur Multiplier
-                     label="Image" left="1" mouse_opaque="false" name="Waves"
+                        </text>
-                     width="698">
+                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             left="630" name="WaterBlurMultiplierHelp" width="18" />
-                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
+                        <slider bottom_delta="-30" can_edit_text="false" control_name="WaterBlurMult"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
+                             decimal_digits="3" follows="left" height="10" increment=".001"
-                             left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">
+                             initial_val="0" label="" left="494" max_val=".16" min_val="0"
-                                Big Wave Direction
+                             mouse_opaque="true" name="WaterBlurMult" show_text="true" value="0"
-                        </text>
+                             width="200" />
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+                </panel>
-                             left="155" name="WaterWave1Help" width="18" />
+                <panel border="true" bottom="-240" follows="left|top|right|bottom" height="180"
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                     label="Image" left="1" mouse_opaque="false" name="Waves"
-                             bottom="-37" drop_shadow_visible="true" follows="left|top|right"
+                     width="698">
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             left="10" mouse_opaque="true" name="WaterWave1DirXText" v_pad="0"
+                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             width="10">
+                             font="SansSerif" h_pad="0" halign="left" height="16"
-                                X
+                             left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">
-                        </text>
+                                Big Wave Direction
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                        </text>
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
+                             left="155" name="WaterWave1Help" width="18" />
-                             left_delta="0" mouse_opaque="true" name="WaterWave1DirYText" v_pad="0"
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             width="10">
+                             bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-                                Y
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                        </text>
+                             left="10" mouse_opaque="true" name="WaterWave1DirXText" v_pad="0"
-                        <slider bottom="-50" can_edit_text="false" control_name="WaterWave1DirX"
+                             width="10">
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
+                                X
-                             initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
+                        </text>
-                             mouse_opaque="true" name="WaterWave1DirX" show_text="true" value="0.7"
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             width="200" />
+                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WaterWave1DirY"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
+                             left_delta="0" mouse_opaque="true" name="WaterWave1DirYText" v_pad="0"
-                             initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
+                             width="10">
-                             mouse_opaque="true" name="WaterWave1DirY" show_text="true" value="0.7"
+                                Y
-                             width="200" />
+                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                        <slider bottom="-50" can_edit_text="false" control_name="WaterWave1DirX"
-                             bottom="-70" drop_shadow_visible="true" follows="left|top|right"
+                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
+                             initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
-                             left="10" mouse_opaque="true" name="BHText2" v_pad="0" width="355">
+                             mouse_opaque="true" name="WaterWave1DirX" show_text="true" value="0.7"
-                                Little Wave Direction
+                             width="200" />
-                        </text>
+                        <slider bottom_delta="-11" can_edit_text="false" control_name="WaterWave1DirY"
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             left="155" name="WaterWave2Help" width="18" />
+                             initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             mouse_opaque="true" name="WaterWave1DirY" show_text="true" value="0.7"
-                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
+                             width="200" />
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             left="10" mouse_opaque="true" name="WaterWave2DirXText" v_pad="0"
+                             bottom="-70" drop_shadow_visible="true" follows="left|top|right"
-                             width="10">
+                             font="SansSerif" h_pad="0" halign="left" height="16"
-                                X
+                             left="10" mouse_opaque="true" name="BHText2" v_pad="0" width="355">
-                        </text>
+                                Little Wave Direction
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                        </text>
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
+                             left="155" name="WaterWave2Help" width="18" />
-                             left_delta="0" mouse_opaque="true" name="WaterWave2DirYText" v_pad="0"
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             width="10">
+                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                                Y
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                        </text>
+                             left="10" mouse_opaque="true" name="WaterWave2DirXText" v_pad="0"
-                        <slider bottom="-100" can_edit_text="false" control_name="WaterWave2DirX"
+                             width="10">
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
+                                X
-                             initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
+                        </text>
-                             mouse_opaque="true" name="WaterWave2DirX" show_text="true" value="0.7"
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             width="200" />
+                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WaterWave2DirY"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
+                             left_delta="0" mouse_opaque="true" name="WaterWave2DirYText" v_pad="0"
-                             initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
+                             width="10">
-                             mouse_opaque="true" name="WaterWave2DirY" show_text="true" value="0.7"
+                                Y
-                             width="200" />
+                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                        <slider bottom="-100" can_edit_text="false" control_name="WaterWave2DirX"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
+                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
+                             initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
-                             left="240" mouse_opaque="true" name="BHText3" v_pad="0" width="355">
+                             mouse_opaque="true" name="WaterWave2DirX" show_text="true" value="0.7"
-                                Normal Map
+                             width="200" />
-                        </text>
+                        <slider bottom_delta="-11" can_edit_text="false" control_name="WaterWave2DirY"
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             left="365" name="WaterNormalMapHelp" width="18" />
+                             initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
-                        <texture_picker bottom="-165" height="143" label="" left="250" name="WaterNormalMap"
+                             mouse_opaque="true" name="WaterWave2DirY" show_text="true" value="0.7"
-                             width="128" />
+                             width="200" />
-                </panel>
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-        </tab_container>
+                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-        <string name="WLDefaultWaterNames">
+                             font="SansSerif" h_pad="0" halign="left" height="16"
-                Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
+                             left="240" mouse_opaque="true" name="BHText3" v_pad="0" width="355">
-        </string>
+                                Normal Map
-</floater>
+                        </text>
+                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+                             left="365" name="WaterNormalMapHelp" width="18" />
+                        <texture_picker bottom="-165" height="143" label="" left="250" name="WaterNormalMap"
+                             width="128" />
+                </panel>
+        </tab_container>
+        <string name="WLDefaultWaterNames">
+                Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
+        </string>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_windlight_manager.xml b/linden/indra/newview/skins/default/xui/en-us/floater_windlight_manager.xml
new file mode 100644
index 0000000..9ef70c8
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_windlight_manager.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" height="130" left="50" min_height="130"
+     min_width="300" mouse_opaque="true" name="WindLight send to server floater"
+     title="WindLight Manager"
+     width="300">
+  <button bottom="-50" enabled="true" font="SansSerif" halign="center" height="20"
+             label="This Parcel" label_selected="This Parcel" left="10"
+             mouse_opaque="true" name="this_parcel" scale_image="true" width="90" />
+  <button  bottom="-50" enabled="true" font="SansSerif" halign="center" height="20"
+             label="All Parcels" label_selected="All Parcels" left_delta="95 "
+             mouse_opaque="true" name="all_parcels" scale_image="true" width="90" />
+  <button  bottom="-50" enabled="true" font="SansSerif" halign="center" height="20"
+             label="This Region" label_selected="This Region" left_delta="95 "
+             mouse_opaque="true" name="this_region" scale_image="true" width="90" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-75" drop_shadow_visible="true" follows="left|top|right"
+             font="SansSerif" h_pad="0" halign="left" height="16"
+             left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0"
+             width="110">
+    Settings:
+  </text>
+  <combo_box allow_text_entry="false" bottom="-77" follows="left|top" height="18"
+             left_delta="70" max_chars="20" mouse_opaque="true" name="WLSettingsCombo"
+             width="200" />
+  <button  bottom="-125" enabled="true" font="SansSerif" halign="center" height="20"
+             label="Show" label_selected="Show" left="10"
+             mouse_opaque="true" name="show" scale_image="true" width="80" />
+  <button  bottom="-125" enabled="true" font="SansSerif" halign="center" height="20"
+             label="Set to Current" label_selected="Set to Current" left="95"
+             mouse_opaque="true" name="set_to_current" scale_image="true" width="100" />
+  <button  bottom="-125" enabled="true" font="SansSerif" halign="center" height="20"
+             label="Remove" label_selected="Remove" left="200"
+             mouse_opaque="true" name="remove" scale_image="true" width="80" />
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml b/linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml
index 471b3e5..c5e2c2a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml
@@ -21,578 +21,612 @@
             label="" label_selected="" left_delta="180" image_overlay="arrow_right.tga"
             mouse_opaque="true" name="next" scale_image="true" width="20" />
        <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-             label="New" label_selected="New" left_delta="40"
+             label="New" right="-270"
-             mouse_opaque="true" name="WLNewPreset" scale_image="true" width="70" />
+       mouse_opaque="true" name="WLNewPreset" scale_image="true" width="100" />
-        <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
+  <flyout_button bottom_delta="0" follows="left|top" height="20" width="125"
-             label="Save" label_selected="Save" left_delta="70"
+       label="Save to Disk" right="-140" list_position="above" enabled="true"
-             mouse_opaque="true" name="WLSavePreset" scale_image="true" width="70" />
+       mouse_opaque="true" halign="center" name="WLSavePreset">
-        <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
+    <flyout_button_item value="save_inventory_item" name="save_inventory_item">
-             label="Delete" label_selected="Delete" left_delta="70"
+      Save to Inventory
-             mouse_opaque="true" name="WLDeletePreset" scale_image="true" width="70" />
+    </flyout_button_item>
-        <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
+    <flyout_button_item value="save_disk_item" name="save_disk_item">
-             label="Day Cycle Editor" label_selected="Day Cycle Editor"
+      Save to Disk
-             left_delta="100" mouse_opaque="true" name="WLDayCycleMenuButton"
+    </flyout_button_item>
-             scale_image="true" width="125" />
+    <flyout_button_item value="send_to_server_item" name="send_to_server_item">
-        <tab_container bottom="-220" follows="left|top" height="160" left="0"
+      Send to Server
+    </flyout_button_item>
+  </flyout_button>
+  <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
+             label="Delete File" label_selected="Delete File" right="-10"
+             mouse_opaque="true" name="WLDeletePreset" scale_image="true" width="125" />
+  <tab_container bottom="-220" follows="left|top" height="160" left="0"
             mouse_opaque="false" name="WindLight Tabs" tab_position="top" width="700">
-                <panel border="true" bottom="-220" follows="left|top|right|bottom" height="160"
+    <panel border="true" bottom="-220" follows="left|top|right|bottom" height="160"
                     label="Atmosphere" left="1" mouse_opaque="false"
                     name="Atmosphere" width="698">
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">
-                                Blue Horizon
+        Blue Horizon
-                        </text>
+      </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
                             left="160" name="WLBlueHorizonHelp" width="18" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-37" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left="10" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
-                                R
+        R
-                        </text>
+      </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
-                                G
+        G
-                        </text>
+      </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
-                                B
+        B
-                        </text>
+      </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText5" v_pad="0" width="10">
-                                I
+        I
-                        </text>
+      </text>
-                        <slider bottom="-50" can_edit_text="false" control_name="WLBlueHorizonR"
+      <slider bottom="-50" can_edit_text="false" control_name="WLBlueHorizonR"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="0.7" label="" left="24" max_val="1" min_val="0"
                             mouse_opaque="true" name="WLBlueHorizonR" show_text="true" value="0.7"
                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueHorizonG"
+      <slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueHorizonG"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="0.7" label="" left="24" max_val="1" min_val="0"
                             mouse_opaque="true" name="WLBlueHorizonG" show_text="true" value="0.7"
                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueHorizonB"
+      <slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueHorizonB"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="0.7" label="" left="24" max_val="1" min_val="0"
                             mouse_opaque="true" name="WLBlueHorizonB" show_text="true" value="0.7"
                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueHorizonI"
+      <slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueHorizonI"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="1.0" label="" left="24" max_val="1" min_val="0"
                             mouse_opaque="true" name="WLBlueHorizonI" show_text="true" value="1.0"
                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="10" mouse_opaque="true" name="BDensText" v_pad="0" width="355">
-                                Haze Horizon
+        Haze Horizon
-                        </text>
+      </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
                             left="160" name="WLHazeHorizonHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WLHazeHorizon"
+      <slider bottom_delta="-30" can_edit_text="false" control_name="WLHazeHorizon"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="0.25" label="" left="24" max_val="1.0" min_val="0"
                             mouse_opaque="true" name="WLHazeHorizon" show_text="true" value="1.0"
                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="245" mouse_opaque="true" name="BDensText2" v_pad="0" width="355">
-                                Blue Density
+        Blue Density
-                        </text>
+      </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
                             left="395" name="WLBlueDensityHelp" width="18" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-37" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left="245" mouse_opaque="true" name="BHText6" v_pad="0" width="10">
-                                R
+        R
-                        </text>
+      </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText7" v_pad="0" width="10">
-                                G
+        G
-                        </text>
+      </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText8" v_pad="0" width="10">
-                                B
+        B
-                        </text>
+      </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText9" v_pad="0" width="10">
-                                I
+        I
-                        </text>
+      </text>
-                        <slider bottom="-50" can_edit_text="false" control_name="WLBlueDensityR"
+      <slider bottom="-50" can_edit_text="false" control_name="WLBlueDensityR"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="0.7" label="" left="259" max_val="1" min_val="0"
                             mouse_opaque="true" name="WLBlueDensityR" show_text="true" value="1.0"
                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueDensityG"
+      <slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueDensityG"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="0.7" label="" left="259" max_val="1" min_val="0"
                             mouse_opaque="true" name="WLBlueDensityG" show_text="true" value="1.0"
                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueDensityB"
+      <slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueDensityB"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="0.7" label="" left="259" max_val="1" min_val="0"
                             mouse_opaque="true" name="WLBlueDensityB" show_text="true" value="1.0"
                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueDensityI"
+      <slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueDensityI"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="1" label="" left="259" max_val="1" min_val="0"
                             mouse_opaque="true" name="WLBlueDensityI" show_text="true" value="1.0"
                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="245" mouse_opaque="true" name="HDText" v_pad="0" width="355">
-                                Haze Density
+        Haze Density
-                        </text>
+      </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
                             left="395" name="WLHazeDensityHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WLHazeDensity"
+      <slider bottom_delta="-30" can_edit_text="false" control_name="WLHazeDensity"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="0.7" label="" left="259" max_val="4" min_val="0"
                             mouse_opaque="true" name="WLHazeDensity" show_text="true" value="1.0"
                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="480" mouse_opaque="true" name="DensMultText" v_pad="0" width="355">
-                                Density Multiplier
+        Density Multiplier
-                        </text>
+      </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
                             left="630" name="WLDensityMultHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WLDensityMult"
+      <slider bottom_delta="-30" can_edit_text="false" control_name="WLDensityMult"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="0.1" label="" left="494" max_val="0.9" min_val="0"
                             mouse_opaque="true" name="WLDensityMult" show_text="true" value="1.0"
                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-53" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="480" mouse_opaque="true" name="WLDistanceMultText" v_pad="0"
                             width="355">
-                                Distance Multiplier
+        Distance Multiplier
-                        </text>
+      </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
                             left="630" name="WLDistanceMultHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WLDistancMult"
+      <slider bottom_delta="-30" can_edit_text="false" control_name="WLDistancMult"
                             decimal_digits="1" follows="left" height="10" increment="0.1"
                             initial_val="1.0" label="" left="494" max_val="100" min_val="0"
                             mouse_opaque="true" name="WLDistanceMult" show_text="true" value="0.0"
                             width="207" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="480" mouse_opaque="true" name="MaxAltText" v_pad="0" width="355">
-                                Max Altitude
+        Max Altitude
-                        </text>
+      </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
                             left="630" name="WLMaxAltitudeHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WLMaxAltitude"
+      <slider bottom_delta="-30" can_edit_text="false" control_name="WLMaxAltitude"
                             decimal_digits="0" follows="left" height="10" increment="1"
                             initial_val="500" label="" left="494" max_val="4000" min_val="0"
                             mouse_opaque="true" name="WLMaxAltitude" show_text="true" value="4000"
                             width="205" />
-                </panel>
+      <button bottom="4" enabled="true" font="SansSerif" halign="center" height="20"
-                <panel border="true" bottom="-180" follows="left|top|right|bottom" height="160"
+         label="Day Cycle Editor" label_selected="Day Cycle Editor"
+         right="-10" mouse_opaque="true" name="WLDayCycleMenuButton"
+         scale_image="true" width="150" />
+    </panel>
+    <panel border="true" bottom="-180" follows="left|top|right|bottom" height="160"
                     label="Lighting" left="1" mouse_opaque="true"
                     name="Lighting" width="698">
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="10" mouse_opaque="true" name="SLCText" v_pad="0" width="355">
-                                Sun/Moon Color
+        Sun/Moon Color
-                        </text>
+      </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
                             left="160" name="WLSunlightColorHelp" width="18" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-37" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left="10" mouse_opaque="true" name="BHText" v_pad="0" width="10">
-                                R
+        R
-                        </text>
+      </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
-                                G
+        G
-                        </text>
+      </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
-                                B
+        B
-                        </text>
+      </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
-                                I
+        I
-                        </text>
+      </text>
-                        <slider bottom="-50" can_edit_text="false" control_name="WLSunlightR"
+      <slider bottom="-50" can_edit_text="false" control_name="WLSunlightR"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="0.7" label="" left="24" max_val="1" min_val="0"
                             mouse_opaque="true" name="WLSunlightR" show_text="true" value="0.7"
                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLSunlightG"
+      <slider bottom_delta="-11" can_edit_text="false" control_name="WLSunlightG"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="0.7" label="" left="24" max_val="1" min_val="0"
                             mouse_opaque="true" name="WLSunlightG" show_text="true" value="0.7"
                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLSunlightB"
+      <slider bottom_delta="-11" can_edit_text="false" control_name="WLSunlightB"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="0.7" label="" left="24" max_val="1" min_val="0"
                             mouse_opaque="true" name="WLSunlightB" show_text="true" value="0.7"
                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLSunlightI"
+      <slider bottom_delta="-11" can_edit_text="false" control_name="WLSunlightI"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="1.0" label="" left="24" max_val="1" min_val="0"
                             mouse_opaque="true" name="WLSunlightI" show_text="true" value="1.0"
                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="10" mouse_opaque="true" name="TODText" v_pad="0" width="355">
-                                Sun/Moon Position
+        Sun/Moon Position
-                        </text>
+      </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
                             left="160" name="WLTimeOfDayHelp" width="18" />
-                        <icon bottom_delta="-30" follows="left|top" height="20" image_name="icon_diurnal.tga"
+      <icon bottom_delta="-30" follows="left|top" height="20" image_name="icon_diurnal.tga"
                             left="30" name="SkyDayCycle" width="148" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WLSunAngle"
+      <slider bottom_delta="-30" can_edit_text="false" control_name="WLSunAngle"
                             decimal_digits="3" follows="left" height="10" increment="0.001"
                             initial_val="0.7" label="" left="24" max_val="1" min_val="0"
                             mouse_opaque="true" name="WLSunAngle" show_text="true" value="1.0"
                             width="204" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="245" mouse_opaque="true" name="WLAmbientText" v_pad="0" width="355">
-                                Ambient
+        Ambient
-                        </text>
+      </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
                             left="395" name="WLAmbientHelp" width="18" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-37" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left="245" mouse_opaque="true" name="BHText5" v_pad="0" width="10">
-                                R
+        R
-                        </text>
+      </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText6" v_pad="0" width="10">
-                                G
+        G
-                        </text>
+      </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText7" v_pad="0" width="10">
-                                B
+        B
-                        </text>
+      </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText8" v_pad="0" width="10">
-                                I
+        I
-                        </text>
+      </text>
-                        <slider bottom="-50" can_edit_text="false" control_name="WLAmbientR" decimal_digits="2"
+      <slider bottom="-50" can_edit_text="false" control_name="WLAmbientR" decimal_digits="2"
                             follows="left" height="10" increment="0.01" initial_val="0.7" label=""
                             left="259" max_val="1" min_val="0" mouse_opaque="true" name="WLAmbientR"
                             show_text="true" value="1.0" width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLAmbientG"
+      <slider bottom_delta="-11" can_edit_text="false" control_name="WLAmbientG"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="0.7" label="" left="259" max_val="1" min_val="0"
                             mouse_opaque="true" name="WLAmbientG" show_text="true" value="1.0"
                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLAmbientB"
+      <slider bottom_delta="-11" can_edit_text="false" control_name="WLAmbientB"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="0.7" label="" left="259" max_val="1" min_val="0"
                             mouse_opaque="true" name="WLAmbientB" show_text="true" value="1.0"
                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLAmbientI"
+      <slider bottom_delta="-11" can_edit_text="false" control_name="WLAmbientI"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="1" label="" left="259" max_val="1" min_val="0"
                             mouse_opaque="true" name="WLAmbientI" show_text="true" value="1.0"
                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="245" mouse_opaque="true" name="WLEastAngleText" v_pad="0" width="355">
-                                East Angle
+        East Angle
-                        </text>
+      </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
                             left="395" name="WLEastAngleHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WLEastAngle"
+      <slider bottom_delta="-30" can_edit_text="false" control_name="WLEastAngle"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="0.0" label="" left="259" max_val="1" min_val="0"
                             mouse_opaque="true" name="WLEastAngle" show_text="true" value="1.0"
                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="480" mouse_opaque="true" name="SunGlowText" v_pad="0" width="355">
-                                Sun Glow
+        Sun Glow
-                        </text>
+      </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
                             left="630" name="WLSunGlowHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WLGlowB"
+      <slider bottom_delta="-30" can_edit_text="false" control_name="WLGlowB"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="0.1" label="Focus " left="494" max_val="0.5" min_val="0"
                             mouse_opaque="true" name="WLGlowB" show_text="true" value="1.0" width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLGlowR"
+      <slider bottom_delta="-11" can_edit_text="false" control_name="WLGlowR"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="0.25" label="Size    " left="494" max_val="1.99" min_val="1"
                             mouse_opaque="true" name="WLGlowR" show_text="true" value="1.0" width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-67" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="480" mouse_opaque="true" name="SceneGammaText" v_pad="0" width="200">
-                                Scene Gamma
+        Scene Gamma
-                        </text>
+      </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
                             left="630" name="WLSceneGammaHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WLGamma"
+      <slider bottom_delta="-30" can_edit_text="false" control_name="WLGamma"
                             decimal_digits="2" follows="bottom" height="10" increment="0.01"
                             initial_val="2.0" label="" left="494" max_val="10.0" min_val="0"
                             mouse_opaque="true" name="WLGamma" show_text="true" value="2.0" width="207" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-102" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="480" mouse_opaque="true" name="WLStarText" v_pad="0" width="355">
-                                Star Brightness
+        Star Brightness
-                        </text>
+      </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
                             left="630" name="WLStarBrightnessHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WLStarAlpha"
+      <slider bottom_delta="-30" can_edit_text="false" control_name="WLStarAlpha"
                             decimal_digits="2" follows="bottom" height="10" increment="0.01"
                             initial_val="0" label="" left="494" max_val="2" min_val="0"
                             mouse_opaque="true" name="WLStarAlpha" show_text="true" value="0"
                             width="200" />
-                </panel>
+    </panel>
-                <panel border="true" bottom="-180" follows="left|top|right|bottom" height="160"
+    <panel border="true" bottom="-180" follows="left|top|right|bottom" height="160"
                     label="Clouds" left="1" mouse_opaque="false" name="Clouds"
                     width="698">
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="10" mouse_opaque="true" name="WLCloudColorText" v_pad="0" width="355">
-                                Cloud Color
+        Cloud Color
-                        </text>
+      </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
                             left="160" name="WLCloudColorHelp" width="18" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-37" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left="10" mouse_opaque="true" name="BHText" v_pad="0" width="10">
-                                R
+        R
-                        </text>
+      </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
-                                G
+        G
-                        </text>
+      </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
-                                B
+        B
-                        </text>
+      </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
-                                I
+        I
-                        </text>
+      </text>
-                        <slider bottom="-50" can_edit_text="false" control_name="WLCloudColorR"
+      <slider bottom="-50" can_edit_text="false" control_name="WLCloudColorR"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="0.7" label="" left="24" max_val="1" min_val="0"
                             mouse_opaque="true" name="WLCloudColorR" show_text="true" value="0.7"
                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudColorG"
+      <slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudColorG"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="0.7" label="" left="24" max_val="1" min_val="0"
                             mouse_opaque="true" name="WLCloudColorG" show_text="true" value="0.7"
                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudColorB"
+      <slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudColorB"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="0.7" label="" left="24" max_val="1" min_val="0"
                             mouse_opaque="true" name="WLCloudColorB" show_text="true" value="0.7"
                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudColorI"
+      <slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudColorI"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="1.0" label="" left="24" max_val="1" min_val="0"
                             mouse_opaque="true" name="WLCloudColorI" show_text="true" value="1.0"
                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="10" mouse_opaque="true" name="WLCloudColorText2" v_pad="0"
                             width="355">
-                                Cloud XY/Density
+        Cloud XY/Density
-                        </text>
+      </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
                             left="160" name="WLCloudDensityHelp" width="18" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-103" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left="10" mouse_opaque="true" name="BHText5" v_pad="0" width="10">
-                                X
+        X
-                        </text>
+      </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText6" v_pad="0" width="10">
-                                Y
+        Y
-                        </text>
+      </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText7" v_pad="0" width="10">
-                                D
+        D
-                        </text>
+      </text>
-                        <slider bottom="-117" can_edit_text="false" control_name="WLCloudX" decimal_digits="2"
+      <slider bottom="-117" can_edit_text="false" control_name="WLCloudX" decimal_digits="2"
                             follows="left" height="10" increment="0.01" initial_val="0.5" label=""
                             left="24" max_val="1" min_val="0" mouse_opaque="true" name="WLCloudX"
                             show_text="true" value="0.5" width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudY"
+      <slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudY"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="0.5" label="" left="24" max_val="1" min_val="0"
                             mouse_opaque="true" name="WLCloudY" show_text="true" value="0.5"
                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudDensity"
+      <slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudDensity"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="1.0" label="" left="24" max_val="1" min_val="0"
                             mouse_opaque="true" name="WLCloudDensity" show_text="true" value="1.0"
                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="245" mouse_opaque="true" name="WLCloudCoverageText" v_pad="0"
                             width="355">
-                                Cloud Coverage
+        Cloud Coverage
-                        </text>
+      </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
                             left="395" name="WLCloudCoverageHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WLCloudCoverage"
+      <slider bottom_delta="-30" can_edit_text="false" control_name="WLCloudCoverage"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="0.5" label="" left="259" max_val="1" min_val="0"
                             mouse_opaque="true" name="WLCloudCoverage" show_text="true" value="0.0"
                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-55" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="245" mouse_opaque="true" name="WLCloudScaleText" v_pad="0"
                             width="355">
-                                Cloud Scale
+        Cloud Scale
-                        </text>
+      </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
                             left="395" name="WLCloudScaleHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WLCloudScale"
+      <slider bottom_delta="-30" can_edit_text="false" control_name="WLCloudScale"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="1.0" label="" left="259" max_val="1.0" min_val="0.01"
                             mouse_opaque="true" name="WLCloudScale" show_text="true" value="1.0"
                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="245" mouse_opaque="true" name="WLCloudDetailText" v_pad="0"
                             width="355">
-                                Cloud Detail (XY/Density)
+        Cloud Detail (XY/Density)
-                        </text>
+      </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
                             left="395" name="WLCloudDetailHelp" width="18" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-103" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left="245" mouse_opaque="true" name="BHText8" v_pad="0" width="10">
-                                X
+        X
-                        </text>
+      </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText9" v_pad="0" width="10">
-                                Y
+        Y
-                        </text>
+      </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText10" v_pad="0" width="10">
-                                D
+        D
-                        </text>
+      </text>
-                        <slider bottom="-117" can_edit_text="false" control_name="WLCloudDetailX"
+      <slider bottom="-117" can_edit_text="false" control_name="WLCloudDetailX"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="0.5" label="" left="259" max_val="1" min_val="0"
                             mouse_opaque="true" name="WLCloudDetailX" show_text="true" value="0.5"
                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudDetailY"
+      <slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudDetailY"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="0.5" label="" left="259" max_val="1" min_val="0"
                             mouse_opaque="true" name="WLCloudDetailY" show_text="true" value="0.5"
                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudDetailDensity"
+      <slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudDetailDensity"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="1.0" label="" left="259" max_val="1" min_val="0"
                             mouse_opaque="true" name="WLCloudDetailDensity" show_text="true"
                             value="1.0" width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="480" mouse_opaque="true" name="WLCloudScrollXText" v_pad="0"
                             width="355">
-                                Cloud Scroll X
+        Cloud Scroll X
-                        </text>
+      </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
                             left="605" name="WLCloudScrollXHelp" width="18" />
-                        <check_box control_name="WLCloudLockX" follows="left" font="SansSerifSmall" height="16"
+      <check_box control_name="WLCloudLockX" follows="left" font="SansSerifSmall" height="16"
                             initial_value="false" label="Lock" left="625" mouse_opaque="true"
                             name="WLCloudLockX" width="200" />
-                        <slider bottom_delta="-15" can_edit_text="false" control_name="WLCloudScrollX"
+      <slider bottom_delta="-15" can_edit_text="false" control_name="WLCloudScrollX"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="0.5" label="" left="494" max_val="10" min_val="-10"
                             mouse_opaque="true" name="WLCloudScrollX" show_text="true" value="0.0"
                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-60" drop_shadow_visible="true" follows="left|top|right"
+                             bottom="-52" drop_shadow_visible="true" follows="left|top|right"
                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="480" mouse_opaque="true" name="WLCloudScrollYText" v_pad="0"
                             width="355">
-                                Cloud Scroll Y
+        Cloud Scroll Y
-                        </text>
+      </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+      <button bottom_delta="-2" follows="left|top" font="SansSerifSmall" height="18" label="?"
                             left="605" name="WLCloudScrollYHelp" width="18" />
-                        <check_box control_name="WLCloudLockY" follows="left" font="SansSerifSmall" height="16"
+      <check_box control_name="WLCloudLockY" follows="left" font="SansSerifSmall" height="16"
                             initial_value="false" label="Lock" left="625" mouse_opaque="true"
                             name="WLCloudLockY" width="200" />
-                        <slider bottom_delta="-15" can_edit_text="false" control_name="WLCloudScrollY"
+      <slider bottom_delta="-10" can_edit_text="false" control_name="WLCloudScrollY"
                             decimal_digits="2" follows="left" height="10" increment="0.01"
                             initial_val="0.5" label="" left="494" max_val="10" min_val="-10"
                             mouse_opaque="true" name="WLCloudScrollY" show_text="true" value="0.0"
                             width="200" />
-                        <check_box bottom="-120" control_name="DrawClassicClouds" follows="left"
+      <check_box bottom="-102" control_name="DrawClassicClouds" follows="left"
                             font="SansSerifSmall" height="16" initial_value="false"
                             label="Draw Classic Clouds" left="480" mouse_opaque="true"
                             name="DrawClassicClouds" width="200" />
-                        <button bottom="-102" follows="left|top" font="SansSerifSmall" height="18" label="?"
+      <button bottom="-85" follows="left|top" font="SansSerifSmall" height="18" label="?"
                             left="608" name="WLClassicCloudsHelp" width="18" />
-                </panel>
+      <text bottom_delta="-19" type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-        </tab_container>
+                             drop_shadow_visible="true" follows="left|top|right"
+                             font="SansSerif" h_pad="0" halign="left" height="20"
+                             left="480" mouse_opaque="true" name="WLCloudHeightText" v_pad="0"
+                             width="355">
+        Classic Cloud Height
+      </text>
+      <slider bottom_delta="-27" can_edit_text="true" control_name="WLCloudHeight"
+                             decimal_digits="0" follows="left" height="16" increment="1"
+                             initial_val="192" label="" left="494" max_val="1000" min_val="0"
+                             mouse_opaque="true" name="WLCloudHeight" show_text="true" value="192"
+                             width="200" />
+      <text bottom_delta="0" type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             drop_shadow_visible="true" follows="left|top|right"
+                             font="SansSerif" h_pad="0" halign="left" height="20"
+                             left="480" mouse_opaque="true" name="WLCloudClassicRangeText" v_pad="0"
+                             width="355">
+        Classic Cloud Range
+      </text>
+      <slider bottom_delta="-27" can_edit_text="true" control_name="WLCloudClassicRange"
+                             decimal_digits="0" follows="left" height="16" increment="1 "
+                             initial_val="48" label="" left="494" max_val="100" min_val="0"
+                             mouse_opaque="true" name="WLCloudRange" show_text="true" value="48"
+                             width="200" />
+    </panel>
+  </tab_container>
        <string name="WLDefaultSkyNames">
                A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
        </string>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_windlight_remote_save.xml b/linden/indra/newview/skins/default/xui/en-us/floater_windlight_remote_save.xml
new file mode 100644
index 0000000..84c1d04
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_windlight_remote_save.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="true" height="220" left="50" min_height="220"
+     min_width="300" mouse_opaque="true" name="WindLight send to server floater"
+     title="WindLight Send to Server"
+     width="300">
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             left="10" bottom="180" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerif" h_pad="0" halign="left" height="10"
+                             mouse_opaque="true" name="label Type" v_pad="0" width="275">
+    WindLight Send to Server
+  </text>
+  <slider can_edit_text="true" control_name="max_altitude"
+          left="20" bottom="110"
+          decimal_digits="2" follows="left" height="18" increment="0.1"
+          initial_val="4096.0" label="Max Altitude" max_val="4096.001" min_val="0"
+          mouse_opaque="true" name="max_altitude" show_text="true" value="4096.0"
+          width="200" />
+  <button follows="left|top" font="SansSerifSmall" height="18" label="?"
+           left_delta="210" bottom="125" name="max_altitude_help" width="18" enabled="true" />
+  <slider can_edit_text="true" control_name="min_altitude"
+            left="20" bottom="80"
+            decimal_digits="2" follows="left" height="18" increment="0.1"
+            initial_val="1.0" label="Min Altitude" max_val="4096" min_val="0"
+            mouse_opaque="true" name="min_altitude" show_text="true" value="0"
+            width="200" />
+  <button follows="left|top" font="SansSerifSmall" height="18" label="?"
+           left_delta="210" bottom="95" name="min_altitude_help" width="18" enabled="true" />
+  <slider can_edit_text="true" control_name="Fade"
+               left="20" bottom="50"
+               decimal_digits="2" follows="left" height="18" increment="0.1"
+               initial_val="1.0" label="Fade" max_val="10" min_val="0"
+               mouse_opaque="true" name="Fade" show_text="true" value="1.0"
+               width="200" />
+  <button follows="left|top" font="SansSerifSmall" height="18" label="?"
+           left_delta="210" bottom="65" name="fade_help" width="18" />
+  <tab_container bottom="-220" follows="left|top" height="160" left="0"
+             mouse_opaque="false" name="WindLight_Setting_Types" tab_position="top" width="299">
+    <panel border="true" bottom="175" follows="left|top|right|bottom" height="160"
+                     label="Region" left="1" mouse_opaque="false"
+                     name="Region" width="698">
+      <check_box control_name="override_parcel" follows="left" font="SansSerifSmall" height="16"
+           left="20" bottom="30"
+                             initial_value="false" label="Override Parcels" mouse_opaque="true"
+                             name="override_parcel" width="200" enabled="true" />
+      <button follows="left|top" font="SansSerifSmall" height="18" label="?"
+               left_delta="210" bottom="45" name="override_parcel_help" width="18" enabled="true" />
+      <button follows="top|right" font="SansSerif" halign="center"
+               right="-10" bottom="20"
+               height="20" label="Send" label_selected="Send"
+               mouse_opaque="true" name="button_region_send_to_server" scale_image="TRUE" width="78" />
+    </panel>
+    <panel border="true" bottom="175" follows="left|top|right|bottom" height="160"
+                     label="Parcel" left="1" mouse_opaque="false"
+                     name="Parcel" width="698">
+      <!--<slider can_edit_text="true" control_name="max_altitude"
+                left="20" bottom="110"
+                decimal_digits="2" follows="left" height="18" increment="0.1"
+                initial_val="4096.0" label="Max Altitude" max_val="4096.001" min_val="0"
+                mouse_opaque="true" name="max_altitude" show_text="true" value="4096.0"
+                width="200" />
+      <button follows="left|top" font="SansSerifSmall" height="18" label="?"
+               left_delta="210" bottom="125" name="max_altitude_help" width="18" enabled="true" />
+      
+      <slider can_edit_text="true" control_name="min_altitude"
+                left="20" bottom="80"
+                decimal_digits="2" follows="left" height="18" increment="0.1"
+                initial_val="1.0" label="Min Altitude" max_val="4096" min_val="0"
+                mouse_opaque="true" name="min_altitude" show_text="true" value="0"
+                width="200" />
+      <button follows="left|top" font="SansSerifSmall" height="18" label="?"
+               left_delta="210" bottom="95" name="min_altitude_help" width="18" enabled="true" />
+      
+      <slider can_edit_text="true" control_name="Fade"
+                left="20" bottom="50"
+                decimal_digits="2" follows="left" height="18" increment="0.1"
+                initial_val="1.0" label="Fade" max_val="10" min_val="0"
+                mouse_opaque="true" name="Fade" show_text="true" value="1.0"
+                width="200" />
+      <button follows="left|top" font="SansSerifSmall" height="18" label="?"
+               left_delta="210" bottom="65" name="fade_help" width="18" />-->
+      <button follows="top|right" font="SansSerif" halign="center"
+              right="-10" bottom="20" height="20" label="Send"
+              mouse_opaque="true" name="button_parcel_send_to_server" width="78" />
+    </panel>
+    <!--<panel border="true" bottom="175" follows="left|top|right|bottom" height="160"
+                     label="Area" left="1" mouse_opaque="false"
+                     name="Area" width="698">
+      <slider can_edit_text="true" control_name="Max Altitude"
+                left="20" bottom="110"
+                decimal_digits="2" follows="left" height="18" increment="0.1"
+                initial_val="4096.0" label="Max Altitude" max_val="4096.001" min_val="0"
+                mouse_opaque="true" name="Max Altitude" show_text="true" value="4096.0"
+                width="200" />
+      <slider can_edit_text="true" control_name="Min Altitude"
+                left="20" bottom="80"
+                decimal_digits="2" follows="left" height="18" increment="0.1"
+                initial_val="1.0" label="Min Altitude" max_val="4096" min_val="0"
+                mouse_opaque="true" name="Min Altitude" show_text="true" value="0"
+                width="200" />
+      <slider can_edit_text="true" control_name="Fade"
+                left="20" bottom="50"
+                decimal_digits="2" follows="left" height="18" increment="0.1"
+                initial_val="1.0" label="Fade" max_val="10" min_val="0"
+                mouse_opaque="true" name="Fade" show_text="true" value="1.0"
+                width="200" />
+      <button follows="left|top" font="SansSerifSmall" height="18" label="?"
+               left_delta="210" bottom="65" name="fade_help" width="18" />
+      <button follows="top|right" font="SansSerif" halign="center"
+               right="-10" bottom="20"
+               height="20" label="Send" label_selected="Send"
+               mouse_opaque="true" name="button send to server" scale_image="TRUE" width="78" />
+    </panel>-->
+   </tab_container>
+</floater>
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 389efb5..daf217e 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
@@ -1,183 +1,183 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
+<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
-     height="711" min_height="520" min_width="410" name="worldmap"
+     height="711" min_height="520" min_width="410" name="worldmap"
-     rect_control="FloaterWorldMapRect2" title="World Map" width="1243">
+     rect_control="FloaterWorldMapRect2" title="World Map" width="1243">
-        <tab_container bottom="-701" follows="left|top|right|bottom" height="681" left="15"
+        <tab_container bottom="-701" follows="left|top|right|bottom" height="681" left="15"
-             mouse_opaque="false" name="maptab" tab_position="top" width="995">
+             mouse_opaque="false" name="maptab" tab_position="top" width="995">
-                <panel bottom="-680" follows="left|top|right|bottom" height="664" label="Objects"
+                <panel bottom="-680" follows="left|top|right|bottom" height="664" label="Objects"
-                     left="1" mouse_opaque="true" name="objects_mapview" width="993" />
+                     left="1" mouse_opaque="true" name="objects_mapview" width="993" />
-                <panel bottom="-680" follows="left|top|right|bottom" height="664" label="Terrain"
+                <panel bottom="-680" follows="left|top|right|bottom" height="664" label="Terrain"
-                     left="1" mouse_opaque="true" name="terrain_mapview" width="993" />
+                     left="1" mouse_opaque="true" name="terrain_mapview" width="993" />
-        </tab_container>
+        </tab_container>
-        <icon bottom="-50" color="1, 1, 1, 1" follows="top|right" height="16"
+        <icon bottom="-50" color="1, 1, 1, 1" follows="top|right" height="16"
-             image_name="map_avatar_16.tga" left="1013" mouse_opaque="true" name="self"
+             image_name="map_avatar_16.tga" left="1013" mouse_opaque="true" name="self"
-             width="16" />
+             width="16" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-50" drop_shadow_visible="true" follows="top|right"
+             bottom="-50" 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="you_label" v_pad="0" width="145">
+             mouse_opaque="true" name="you_label" v_pad="0" width="145">
-                You
+                You
-        </text>
+        </text>
-        <icon bottom="-50" color="1, 1, 1, 1" follows="top|right" height="16"
+        <icon bottom="-50" color="1, 1, 1, 1" follows="top|right" height="16"
-             image_name="map_home.tga" left="1083" mouse_opaque="true" name="home"
+             image_name="map_home.tga" left="1083" mouse_opaque="true" name="home"
-             width="16" />
+             width="16" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-50" drop_shadow_visible="true" follows="top|right"
+             bottom="-50" 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="home_label" v_pad="0" width="145">
+             mouse_opaque="true" name="home_label" v_pad="0" width="145">
-                Home
+                Home
-        </text>
+        </text>
-        <icon bottom="-70" color="0.5, 0.25, 1, 1" follows="top|right" height="16"
+        <icon bottom="-70" color="0.5, 0.25, 1, 1" follows="top|right" height="16"
-             image_name="legend.tga" left="1013" mouse_opaque="true" name="square2"
+             image_name="legend.tga" left="1013" mouse_opaque="true" name="square2"
-             width="16" />
+             width="16" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-70" drop_shadow_visible="true" follows="top|right"
+             bottom="-70" 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="auction_label" v_pad="0" width="145">
+             mouse_opaque="true" name="auction_label" v_pad="0" width="145">
-                Auction
+                Auction
-        </text>
+        </text>
-        <icon bottom="-70" color="1, 1, 0.25, 1" follows="top|right" height="16"
+        <icon bottom="-70" color="1, 1, 0.25, 1" follows="top|right" height="16"
-             image_name="legend.tga" left="1083" mouse_opaque="true" name="square"
+             image_name="legend.tga" left="1083" mouse_opaque="true" name="square"
-             width="16" />
+             width="16" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-70" drop_shadow_visible="true" follows="top|right"
+             bottom="-70" 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="land_for_sale_label" v_pad="0" width="145">
+             mouse_opaque="true" name="land_for_sale_label" v_pad="0" width="145">
-                Land For Sale
+                Land For Sale
-        </text>
+        </text>
-        <button bottom="-50" follows="top|right" font="SansSerifSmall" halign="center"
+        <button bottom="-50" follows="top|right" font="SansSerifSmall" halign="center"
-             height="16" label="Go Home" label_selected="Go Home" left="1150"
+             height="16" label="Go Home" label_selected="Go Home" left="1150"
-             mouse_opaque="true" name="Go Home" tool_tip="Teleport to your home"
+             mouse_opaque="true" name="Go Home" tool_tip="Teleport to your home"
-             width="88" />
+             width="88" />
-        <icon bottom="-92" color="0, 1, 0, 1" follows="top|right" height="8"
+        <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"
+                image_name="map_avatar_8.tga" left="1017" mouse_opaque="true" name="person"
-                width="8" />
+                width="8" />
-        <check_box bottom="-96" control_name="MapShowPeople" follows="top|right"
+        <check_box bottom="-96" control_name="MapShowPeople" follows="top|right"
-                font="SansSerifSmall" height="16" initial_value="false" label="Resident"
+                font="SansSerifSmall" height="16" initial_value="false" label="Resident"
-                left_delta="16" mouse_opaque="true" name="people_chk" width="110" />
+                left_delta="16" mouse_opaque="true" name="people_chk" width="110" />
-        <icon bottom="-116" color="1, 1, 1, 1" follows="top|right" height="16"
+        <icon bottom="-116" 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" />
-        <check_box bottom="-116" control_name="MapShowInfohubs" follows="top|right"
+        <check_box bottom="-116" control_name="MapShowInfohubs" follows="top|right"
-                font="SansSerifSmall" height="16" initial_value="false" label="Infohub"
+                font="SansSerifSmall" height="16" initial_value="false" label="Infohub"
-                left_delta="20" mouse_opaque="true" name="infohub_chk" width="110" />
+                left_delta="20" mouse_opaque="true" name="infohub_chk" width="110" />
-        <icon bottom="-136" color="1, 1, 1, 1" follows="top|right" height="16"
+        <icon bottom="-136" 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" />
-        <check_box bottom="-136" control_name="MapShowTelehubs" follows="top|right"
+        <check_box bottom="-136" control_name="MapShowTelehubs" follows="top|right"
-                font="SansSerifSmall" height="16" initial_value="false" label="Telehub"
+                font="SansSerifSmall" height="16" initial_value="false" label="Telehub"
-                left_delta="20" mouse_opaque="true" name="telehubchk" width="110" />
+                left_delta="20" mouse_opaque="true" name="telehubchk" width="110" />
-        <icon bottom="-156" color="1, 1, 1, 1" follows="top|right" height="16"
+        <icon bottom="-156" color="1, 1, 1, 1" follows="top|right" height="16"
-             image_name="icon_for_sale.tga" left="1013" mouse_opaque="true"
+             image_name="icon_for_sale.tga" left="1013" mouse_opaque="true"
-             name="landforsale" width="16" />
+             name="landforsale" width="16" />
-        <check_box bottom="-156" control_name="MapShowLandForSale" follows="top|right"
+        <check_box bottom="-156" control_name="MapShowLandForSale" follows="top|right"
-             font="SansSerifSmall" height="16" initial_value="false" label="Land for Sale"
+             font="SansSerifSmall" height="16" initial_value="false" label="Land for Sale"
-             left_delta="20" mouse_opaque="true" name="land_for_sale_chk" width="110" />
+             left_delta="20" mouse_opaque="true" name="land_for_sale_chk" width="110" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-96" drop_shadow_visible="true" follows="top|right"
+             bottom="-96" drop_shadow_visible="true" follows="top|right"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="1139"
+             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="1139"
-             mouse_opaque="true" name="events_label" v_pad="0" width="145">
+             mouse_opaque="true" name="events_label" v_pad="0" width="145">
-                Events:
+                Events:
-        </text>
+        </text>
-        <icon bottom="-116" color="1, 1, 1, 1" follows="top|right" height="16"
+        <icon bottom="-116" color="1, 1, 1, 1" follows="top|right" height="16"
-             image_name="map_event.tga" left="1151" mouse_opaque="true" name="event"
+             image_name="map_event.tga" left="1151" mouse_opaque="true" name="event"
-             width="16" />
+             width="16" />
-        <check_box bottom="-116" control_name="MapShowEvents" follows="top|right"
+        <check_box bottom="-116" control_name="MapShowEvents" follows="top|right"
-             font="SansSerifSmall" height="16" initial_value="false" label="PG"
+             font="SansSerifSmall" height="16" initial_value="false" label="PG"
-             left_delta="20" mouse_opaque="true" name="event_chk" width="55" />
+             left_delta="20" mouse_opaque="true" name="event_chk" width="55" />
-        <icon bottom="-136" color="1, 1, 1, 1" follows="top|right" height="16"
+        <icon bottom="-136" color="1, 1, 1, 1" follows="top|right" height="16"
-             image_name="map_event_mature.tga" left="1151" mouse_opaque="true"
+             image_name="map_event_mature.tga" left="1151" mouse_opaque="true"
-             name="events_mature_icon" width="16" />
+             name="events_mature_icon" width="16" />
-        <check_box bottom="-136" control_name="ShowMatureEvents" follows="top|right"
+        <check_box bottom="-136" control_name="ShowMatureEvents" follows="top|right"
-             font="SansSerifSmall" height="16" initial_value="true" label="Mature"
+             font="SansSerifSmall" height="16" initial_value="true" label="Mature"
-             left_delta="20" mouse_opaque="true" name="event_mature_chk" width="55" />
+             left_delta="20" mouse_opaque="true" name="event_mature_chk" width="55" />
-        <icon bottom="-156" color="1, 1, 1, 1" follows="top|right" height="16"
+        <icon bottom="-156" color="1, 1, 1, 1" follows="top|right" height="16"
-             image_name="map_event_adult.tga" left="1151" mouse_opaque="true"
+             image_name="map_event_adult.tga" left="1151" mouse_opaque="true"
-             name="events_adult_icon" width="16" />
+             name="events_adult_icon" width="16" />
-        <check_box bottom="-156" control_name="ShowAdultEvents" follows="top|right"
+        <check_box bottom="-156" control_name="ShowAdultEvents" follows="top|right"
-             font="SansSerifSmall" height="16" initial_value="false" label="Adult"
+             font="SansSerifSmall" height="16" initial_value="false" label="Adult"
-             left_delta="20" mouse_opaque="true" name="event_adult_chk" width="55" />
+             left_delta="20" mouse_opaque="true" name="event_adult_chk" width="55" />
-        <icon bottom="-180" color="0.5, 0, 0, 1" follows="top|right" height="16"
+        <icon bottom="-180" color="0.5, 0, 0, 1" follows="top|right" height="16"
-             image_name="map_track_16.tga" left="1013" mouse_opaque="true"
+             image_name="map_track_16.tga" left="1013" mouse_opaque="true"
-             name="avatar_icon" width="16" />
+             name="avatar_icon" width="16" />
-        <combo_box allow_text_entry="true" bottom_delta="0" follows="top|right" height="20"
+        <combo_box allow_text_entry="true" bottom_delta="0" follows="top|right" height="20"
-             label="Online Friends" left_delta="20" max_chars="60" mouse_opaque="true"
+             label="Online Friends" left_delta="20" max_chars="60" mouse_opaque="true"
-             name="friend combo" tool_tip="Friend to Show on Map" width="202">
+             name="friend combo" tool_tip="Friend to Show on Map" width="202">
-                <combo_item name="none_selected" value="None">
+                <combo_item name="none_selected" value="None">
-                        Online Friends
+                        Online Friends
-                </combo_item>
+                </combo_item>
-        </combo_box>
+        </combo_box>
-        <icon bottom_delta="-25" color="0.5, 0, 0, 1" follows="top|right" height="16"
+        <icon bottom_delta="-25" color="0.5, 0, 0, 1" follows="top|right" height="16"
-             image_name="map_track_16.tga" left="1013" mouse_opaque="true"
+             image_name="map_track_16.tga" left="1013" mouse_opaque="true"
-             name="landmark_icon" width="16" />
+             name="landmark_icon" width="16" />
-        <combo_box allow_text_entry="true" bottom_delta="0" follows="top|right" height="20"
+        <combo_box allow_text_entry="true" bottom_delta="0" follows="top|right" height="20"
-             label="Landmarks" left_delta="20" max_chars="64" 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">
+             name="landmark combo" tool_tip="Landmark to Show on Map" width="202">
-                <combo_item name="none_selected" value="None">
+                <combo_item name="none_selected" value="None">
-                        Landmarks
+                        Landmarks
-                </combo_item>
+                </combo_item>
-        </combo_box>
+        </combo_box>
-        <icon bottom_delta="-25" color="0.5, 0, 0, 1" follows="top|right" height="16"
+        <icon bottom_delta="-25" color="0.5, 0, 0, 1" follows="top|right" height="16"
-             image_name="map_track_16.tga" left="1013" mouse_opaque="true"
+             image_name="map_track_16.tga" left="1013" mouse_opaque="true"
-             name="location_icon" width="16" />
+             name="location_icon" width="16" />
-        <line_editor bottom_delta="0" follows="top|right" height="20" label="Search by Region Name"
+        <line_editor bottom_delta="0" follows="top|right" height="20" label="Search by Region Name"
-             left_delta="20" name="location" select_on_focus="true"
+             left_delta="20" name="location" select_on_focus="true"
-             tool_tip="Type the name of a region" width="140" />
+             tool_tip="Type the name of a region" width="140" />
-        <button bottom_delta="0" follows="top|right" font="SansSerif" halign="center"
+        <button bottom_delta="0" follows="top|right" font="SansSerif" halign="center"
-             height="20" label="Search" left_delta="145" mouse_opaque="true"
+             height="20" label="Search" left_delta="145" mouse_opaque="true"
-             name="DoSearch" tool_tip="Search for region" width="60" />
+             name="DoSearch" tool_tip="Search for region" width="60" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-20" drop_shadow_visible="true" follows="top|right"
+             bottom_delta="-20" drop_shadow_visible="true" follows="top|right"
-             font="SansSerif" h_pad="0" halign="left" height="16" left="1013"
+             font="SansSerif" h_pad="0" halign="left" height="16" left="1013"
-             mouse_opaque="true" name="search_label" v_pad="0" width="222">
+             mouse_opaque="true" name="search_label" v_pad="0" width="222">
-                Search Results:
+                Search Results:
-        </text>
+        </text>
-        <scroll_list background_visible="true" bottom_delta="-326" draw_border="true"
+        <scroll_list background_visible="true" bottom_delta="-326" draw_border="true"
-             draw_stripes="false" 
+             draw_stripes="false" 
-             follows="top|right|bottom" height="320" left="1013" multi_select="false"
+             follows="top|right|bottom" height="320" left="1013" multi_select="false"
-             name="search_results" width="222">
+             name="search_results" width="222">
-                <column label="" name="icon" width="16" />
+                <column label="" name="icon" width="16" />
-                <column label="" name="sim_name" width="206" />
+                <column label="" name="sim_name" width="206" />
-        </scroll_list>
+        </scroll_list>
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-20" drop_shadow_visible="true" follows="bottom|right"
+             bottom_delta="-20" drop_shadow_visible="true" follows="bottom|right"
-             font="SansSerif" h_pad="0" halign="left" height="16" left="1013"
+             font="SansSerif" h_pad="0" halign="left" height="16" left="1013"
-             mouse_opaque="true" name="location_label" v_pad="0" width="98">
+             mouse_opaque="true" name="location_label" v_pad="0" width="98">
-                Location:
+                Location:
-        </text>
+        </text>
-        <spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16"
+        <spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16"
-             increment="1" initial_val="128" left="1090" max_val="255" min_val="0"
+             increment="1" initial_val="128" left="1090" max_val="99999" min_val="0"
-             mouse_opaque="true" name="spin x"
+             mouse_opaque="true" name="spin x"
-             tool_tip="X coordinate of location to show on map" width="48" />
+             tool_tip="X coordinate of location to show on map" width="48" />
-        <spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16"
+        <spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16"
-             increment="1" initial_val="128" left_delta="50" max_val="255" min_val="0"
+             increment="1" initial_val="128" left_delta="50" max_val="99999" min_val="0"
-             mouse_opaque="true" name="spin y"
+             mouse_opaque="true" name="spin y"
-             tool_tip="Y coordinate of location to show on map" width="48" />
+             tool_tip="Y coordinate of location to show on map" width="48" />
-        <spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16"
+        <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="4096" min_val="0"
-             mouse_opaque="true" name="spin z"
+             mouse_opaque="true" name="spin z"
-             tool_tip="Z coordinate of location to show on map" width="48" />
+             tool_tip="Z coordinate of location to show on map" width="48" />
-        <button bottom="-625" follows="right|bottom" font="SansSerif" halign="center"
+        <button bottom="-625" follows="right|bottom" font="SansSerif" halign="center"
-             height="20" label="Teleport" label_selected="Teleport" left="-230"
+             height="20" label="Teleport" label_selected="Teleport" left="-230"
-             mouse_opaque="true" name="Teleport"
+             mouse_opaque="true" name="Teleport"
-             tool_tip="Teleport to selected location" width="90" />
+             tool_tip="Teleport to selected location" width="90" />
-        <button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
+        <button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
-             height="20" label="Show Destination" label_selected="Show Destination"
+             height="20" label="Show Destination" label_selected="Show Destination"
-             left_delta="100" mouse_opaque="true" name="Show Destination"
+             left_delta="100" mouse_opaque="true" name="Show Destination"
-             tool_tip="Center map on selected location" width="125" />
+             tool_tip="Center map on selected location" width="125" />
-        <button bottom_delta="-24" follows="right|bottom" font="SansSerif" halign="center"
+        <button bottom_delta="-24" follows="right|bottom" font="SansSerif" halign="center"
-             height="20" label="Clear" label_selected="Clear" left="-230"
+             height="20" label="Clear" label_selected="Clear" left="-230"
-             mouse_opaque="true" name="Clear" tool_tip="Stop tracking" width="90" />
+             mouse_opaque="true" name="Clear" tool_tip="Stop tracking" width="90" />
-        <button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
+        <button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
-             height="20" label="Show My Location" label_selected="Show My Location"
+             height="20" label="Show My Location" label_selected="Show My Location"
-             left_delta="100" mouse_opaque="true" name="Show My Location"
+             left_delta="100" mouse_opaque="true" name="Show My Location"
-             tool_tip="Center map on your avatar&apos;s location" width="125" />
+             tool_tip="Center map on your avatar&apos;s location" width="125" />
-        <button bottom_delta="-24" enabled="false" follows="bottom|right" font="SansSerif"
+        <button bottom_delta="-24" enabled="false" follows="bottom|right" font="SansSerif"
-             height="20" label="Copy SLURL to clipboard" left="-230" name="copy_slurl"
+             height="20" label="Copy SLURL to clipboard" left="-230" name="copy_slurl"
-             tool_tip="Copies current location as SLURL to be used on the web."
+             tool_tip="Copies current location as SLURL to be used on the web."
-             width="222" />
+             width="222" />
-        <slider bottom="-697" can_edit_text="false" decimal_digits="3" follows="right|bottom"
+        <slider bottom="-697" can_edit_text="false" decimal_digits="3" follows="right|bottom"
-             height="16" increment="0.2" initial_val="48.5029" label="Zoom" left="-230"
+             height="16" increment="0.2" initial_val="48.5029" label="Zoom" left="-230"
-             max_val="0" min_val="-8" mouse_opaque="true" name="zoom slider"
+             max_val="0" min_val="-8" mouse_opaque="true" name="zoom slider"
-             show_text="false" value="48.5029" width="222" />
+             show_text="false" value="48.5029" width="222" />
-</floater>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/fonts.xml b/linden/indra/newview/skins/default/xui/en-us/fonts.xml
index 7343ac2..e9ede83 100644
--- a/linden/indra/newview/skins/default/xui/en-us/fonts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/fonts.xml
@@ -147,6 +147,10 @@
             comment="Size of large font (points, or 1/72 of an inch)"
             size="12"
             />
+  <font_size name="Bigger"
+             comment="Size of medium font (points, or 1/72 of an inch)"
+             size="11"
+             />
  <font_size name="Medium"
             comment="Size of medium font (points, or 1/72 of an inch)"
             size="10"
diff --git a/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_attachment.xml b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_attachment.xml
index 18bedd0..35f3037 100644
--- a/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_attachment.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_attachment.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<pie_menu name="Attachment Pie">
+<pie_menu name="Attachment Pie">
-        <menu_item_call enabled="false" label="Drop" mouse_opaque="true" name="Drop">
+        <menu_item_call enabled="false" label="Drop" mouse_opaque="true" name="Drop">
-                <on_click function="Attachment.Drop" />
+                <on_click function="Attachment.Drop" />
-                <on_enable function="Attachment.EnableDrop" />
+                <on_enable function="Attachment.EnableDrop" />
-        </menu_item_call>
+        </menu_item_call>
-        <menu_item_separator />
+        <menu_item_separator />
-        <menu_item_separator />
+        <menu_item_separator />
-        <menu_item_separator />
+        <menu_item_separator />
-        <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
+        <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
-                <on_click function="Object.Inspect" />
+                <on_click function="Object.Inspect" />
-                <on_enable function="Object.EnableInspect" />
+                <on_enable function="Object.EnableInspect" />
-        </menu_item_call>
+        </menu_item_call>
-        <menu_item_separator />
+        <menu_item_separator />
-        <menu_item_call enabled="false" label="Detach" mouse_opaque="true" name="Detach">
+        <menu_item_call enabled="false" label="Detach" mouse_opaque="true" name="Detach">
-                <on_click function="Attachment.Detach" />
+                <on_click function="Attachment.Detach" />
-                <on_enable function="Attachment.EnableDetach" />
+                <on_enable function="Attachment.EnableDetach" />
-        </menu_item_call>
+        </menu_item_call>
-        <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit">
+        <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit">
-                <on_click function="Object.Edit" />
+                <on_click function="Object.Edit" />
-                <on_enable function="EnableEdit" />
+                <on_enable function="EnableEdit" />
-        </menu_item_call>
+        </menu_item_call>
-</pie_menu>
+</pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_avatar.xml
index 0e5c379..dcf7521 100644
--- a/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_avatar.xml
@@ -37,15 +37,18 @@
                        <on_click function="Avatar.Eject" />
                        <on_enable function="Avatar.EnableFreezeEject" />
                </menu_item_call>
-                <menu_item_call enabled="false" label="Debug..." mouse_opaque="true" name="Debug...">
+    <menu_item_call enabled="true" label="Derender" mouse_opaque="true" name="Derender">
-                        <on_click function="Avatar.Debug" />
+      <on_click function="Object.DERENDER" />
-                        <on_visible function="Avatar.VisibleDebug" />
+    </menu_item_call>
-                        <on_enable function="Avatar.EnableDebug" />
+    <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Avatar Inspect">
-                </menu_item_call>
-                <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Avatar Inspect">
                        <on_click function="Object.Inspect" />
                        <on_enable function="Object.EnableInspect" />
                </menu_item_call>
+    <menu_item_call enabled="false" label="Debug..." mouse_opaque="true" name="Debug...">
+      <on_click function="Avatar.Debug" />
+      <on_visible function="Avatar.VisibleDebug" />
+      <on_enable function="Avatar.EnableDebug" />
+    </menu_item_call>
        </pie_menu>
        <menu_item_call enabled="false" label="Send IM..." mouse_opaque="true" name="Send IM...">
                <on_click function="Avatar.SendIM" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_object.xml b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_object.xml
index 23591ef..ff142b5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_object.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_object.xml
@@ -65,15 +65,17 @@
                                <on_click function="Tools.Unlink" userdata="" />
                                <on_enable function="Tools.EnableUnlink" />
                        </menu_item_call>
-                        <menu_item_call enabled="false" label="Mute" mouse_opaque="true" name="Object Mute">
+      <menu_item_call enabled="true" label="Derender" mouse_opaque="true" name="Derender">
-                                <on_click function="Object.Mute" />
+        <on_click function="Object.DERENDER" />
-                                <on_enable function="Object.EnableMute" />
+      </menu_item_call>
-                        </menu_item_call>
+      <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
-                        <menu_item_separator />
+        <on_click function="Object.Inspect" />
-                        <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
+        <on_enable function="Object.EnableInspect" />
-                                <on_click function="Object.Inspect" />
+      </menu_item_call>
-                                <on_enable function="Object.EnableInspect" />
+      <menu_item_call enabled="false" label="Mute" mouse_opaque="true" name="Object Mute">
-                        </menu_item_call>
+        <on_click function="Object.Mute" />
+        <on_enable function="Object.EnableMute" />
+      </menu_item_call>
                </pie_menu>
                <menu_item_call enabled="false" label="Buy..." mouse_opaque="true" name="Buy...">
                        <on_click function="Object.Buy" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_areasearch.xml b/linden/indra/newview/skins/default/xui/en-us/menu_areasearch.xml
new file mode 100644
index 0000000..c55d1b3
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_areasearch.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu bottom="100" color="MenuDefaultBgColor" drop_shadow="true" height="101" left="100"
+         mouse_opaque="false" name="popup" opaque="true" width="128">
+        <menu_item_call bottom_delta="-18" height="18" label="Teleport to" left="0"
+                 mouse_opaque="true" name="teleport" width="128">
+                <on_click function="Popup.HandleMenu" userdata="teleport" />
+        </menu_item_call>
+        <menu_item_call bottom_delta="-18" height="18" label="Cam to" left="0"
+                 mouse_opaque="true" name="cam" width="128">
+                <on_click function="Popup.HandleMenu" userdata="cam" />
+        </menu_item_call>
+        <menu_item_call bottom_delta="-18" height="18" label="Edit" left="0"
+                 mouse_opaque="true" name="edit" width="128">
+                <on_click function="Popup.HandleMenu" userdata="edit" />
+        </menu_item_call>
+</menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
index ad43c9d..86dc5c7 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
@@ -141,6 +141,18 @@
             name="Open" width="128">
                <on_click filter="" function="Inventory.DoToSelected" userdata="open" />
        </menu_item_call>
+        <menu_item_call bottom_delta="-18" height="18" label="Use WindLight Settings" left="0" mouse_opaque="true" 
+                        name="Use WindLight Settings" width="128">
+                <on_click filter="" function="Inventory.DoToSelected" userdata="load_windlight" />
+        </menu_item_call>
+        <menu_item_call bottom_delta="-18" height="18" label="Use Water Settings" left="0" mouse_opaque="true" 
+                        name="Use WaterLight Settings" width="128">
+                <on_click filter="" function="Inventory.DoToSelected" userdata="load_waterlight" />
+        </menu_item_call>
+        <menu_item_call bottom_delta="-18" height="18" label="Edit WindLight Settings" left="0" mouse_opaque="true" 
+                        name="Edit WindLight Settings" width="128">
+                <on_click filter="" function="Inventory.DoToSelected" userdata="edit_windlight" />
+        </menu_item_call>
        <menu_item_call bottom_delta="-18" height="18" label="Properties" left="0" mouse_opaque="true"
             name="Properties" width="128">
                <on_click filter="" function="Inventory.DoToSelected" userdata="properties" />
@@ -154,11 +166,15 @@
                <on_click filter="" function="Inventory.DoToSelected" userdata="copy_uuid" />
        </menu_item_call>
        <menu_item_separator name="Copy Separator" />
-        <menu_item_call bottom_delta="-18" height="18" label="Copy" left="0" mouse_opaque="true"
+  <menu_item_call bottom_delta="-18" height="18" label="Cut" left="0" mouse_opaque="true"
+             name="Cut" width="128">
+    <on_click filter="" function="Inventory.DoToSelected" userdata="cut" />
+  </menu_item_call>
+  <menu_item_call bottom_delta="-18" height="18" label="Copy" left="0" mouse_opaque="true"
             name="Copy" width="128">
-                <on_click filter="" function="Inventory.DoToSelected" userdata="copy" />
+    <on_click filter="" function="Inventory.DoToSelected" userdata="copy" />
-        </menu_item_call>
+  </menu_item_call>
-        <menu_item_call bottom_delta="-18" height="18" label="Paste" left="0" mouse_opaque="true"
+  <menu_item_call bottom_delta="-18" height="18" label="Paste" left="0" mouse_opaque="true"
             name="Paste" width="128">
                <on_click filter="" function="Inventory.DoToSelected" userdata="paste" />
        </menu_item_call>
@@ -237,13 +253,9 @@
             mouse_opaque="true" name="Detach From Yourself" width="128">
                <on_click filter="" function="Inventory.DoToSelected" userdata="detach" />
        </menu_item_call>
-        <!-- COMMENTED OUT for DEV-32347 -->
+        <menu_item_call bottom_delta="-18" height="18" label="Edit" left="0" mouse_opaque="true" name="Attachment Edit" width="128">
-        <!--
+                <on_click filter="" function="Inventory.DoToSelected" userdata="edit" />
-        <menu_item_call bottom_delta="-18" height="18" label="Restore to Last Position" left="0" mouse_opaque="true"
-             name="Restore to Last Position" width="128">
-                <on_click filter="" function="Inventory.DoToSelected" userdata="restoreToWorld" />
        </menu_item_call>
-        -->
        <menu_item_call bottom_delta="-18" height="18" label="Wear" left="0" mouse_opaque="true"
             name="Object Wear" width="128">
                <on_click filter="" function="Inventory.DoToSelected" userdata="attach" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
index 454774e..c65a737 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
@@ -1,32 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu_bar bottom="-18" drop_shadow="false" enabled="true" follows="left|top|right"
+<menu_bar name="Login Menu" opaque="true" tear_off="false" height="18" bottom="-18" follows="left|top|right">
-     height="18" left="0" mouse_opaque="true" name="Login Menu" opaque="true"
+        <menu create_jump_keys="true" label="File" name="File" opaque="true" tear_off="false">
-     tear_off="false" width="802">
+                <menu_item_call label="Quit" name="Quit" shortcut="control|Q">
-        <menu bottom="273" create_jump_keys="true" drop_shadow="true" enabled="true"
-             height="263" label="File" left="0" mouse_opaque="false" name="File"
-             opaque="true" tear_off="false" width="243">
-                <menu_item_call bottom="-29" enabled="true" height="19" label="Quit" left="0"
-                     mouse_opaque="true" name="Quit" shortcut="control|Q" width="243">
                        <on_click function="File.Quit" userdata="" />
                </menu_item_call>
        </menu>
-        <menu bottom="97" create_jump_keys="true" drop_shadow="true" enabled="true"
+        <menu create_jump_keys="true" label="Edit" name="Edit" 
-             height="439" label="Edit" left="38" mouse_opaque="false" name="Edit"
+        opaque="true" tear_off="false">
-             opaque="true" tear_off="false" width="153">
+                <menu_item_call label="Preferences..." name="Preferences..." shortcut="control|P">
-                <menu_item_call bottom="-29" enabled="true" height="19" label="Preferences..." left="0"
-                     mouse_opaque="true" name="Preferences..." shortcut="control|P" width="153">
                        <on_click function="ShowFloater" userdata="preferences" />
                </menu_item_call>
        </menu>
-        <menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
+        <menu create_jump_keys="true" label="Help" name="Help" 
-             height="317" label="Help" left="80" mouse_opaque="false" name="Help"
+        opaque="true" tear_off="false">
-             opaque="true" tear_off="false" width="166">
+                <menu_item_call label="Grid Help" name="Grid Help" shortcut="F1">
-                <menu_item_call bottom="-29" enabled="true" height="19" label="Grid Help" left="0"
-                     mouse_opaque="true" name="Grid Help" shortcut="F1" width="166">
                        <on_click function="ShowFloater" userdata="help f1" />
                </menu_item_call>
-                <menu_item_call bottom="-48" enabled="true" height="19" label="About Imprudence" left="0"
+    <menu_item_separator />
-                     mouse_opaque="true" name="About Imprudence" width="166">
+    <menu_item_call name="Imprudence Blog"
+                    label="Imprudence Blog">
+      <on_click function="PromptShowURL"
+                userdata="WebLaunchImprudenceBlog,http://imprudenceviewer.org/" />
+    </menu_item_call>
+    <menu_item_call name="Imprudence Forums"
+                    label="Imprudence Forums">
+      <on_click function="PromptShowURL"
+                userdata="WebLaunchImprudenceForums,http://imprudenceviewer.org/forums/" />
+    </menu_item_call>
+    <menu_item_separator />
+                <menu_item_call label="About Imprudence" name="About Imprudence">
                        <on_click function="ShowFloater" userdata="about" />
                </menu_item_call>
        </menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
index 039165b..4b31328 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
@@ -25,6 +25,12 @@
    <on_check function="MiniMap.CheckRotate" userdata="" />
  </menu_item_check>
  <menu_item_separator />
+  <menu_item_check bottom_delta="-18" enabled="true" height="18" label="Show Objects"
+    left="0" mouse_opaque="true" name="Show Objects" width="128">
+    <on_click function="MiniMap.ShowObjects" userdata="" />
+    <on_check function="MiniMap.CheckShowObjects" userdata="" />
+  </menu_item_check>
+  <menu_item_separator />
  <menu_item_call bottom_delta="-18" enabled = "false" height="18" label="Show World Map"
                 left="0" mouse_opaque="true" name="Show Map" width="128">
    <on_click function="MiniMap.ShowWorldMap" userdata="" />
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 ead21cd..c87d7de 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
@@ -40,6 +40,9 @@
      <on_click function="Object.Inspect" />
      <on_enable function="Object.EnableInspect" />
    </menu_item_call>
+    <menu_item_call enabled="true" label="Derender" mouse_opaque="true" name="Derender">
+      <on_click function="Object.DERENDER" />
+    </menu_item_call>
    <menu_item_separator />
                <menu_item_call enabled="false" label="Debug..." mouse_opaque="true" name="Debug...">
                        <on_click function="Avatar.Debug" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
index 169d0b9..ec828df 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
@@ -66,11 +66,13 @@
        <on_click function="Object.Inspect" />
        <on_enable function="Object.EnableInspect" />
      </menu_item_call>
+      <menu_item_call enabled="true" label="Derender" mouse_opaque="true" name="Derender">
+        <on_click function="Object.DERENDER" />
+      </menu_item_call>
      <menu_item_call name="Link" enabled="false" label="Link">
        <on_click function="Tools.Link" userdata="" />
        <on_enable function="Tools.EnableLink" />
      </menu_item_call>
-      <menu_item_separator />
      <menu_item_call name="Unlink" enabled="false" label="Unlink">
        <on_click function="Tools.Unlink" userdata="" />
        <on_enable function="Tools.EnableUnlink" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/en-us/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</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 58e3b99..d5b07c8 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,10 +272,16 @@
      <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>
+    <menu_item_check bottom="-192" enabled="true" height="19" label="Media Filter" left="0"
+                     mouse_opaque="true" name="Media Filter" width="211">
+       <on_click function="ShowFloater" userdata="media filter" />
+       <on_check function="FloaterVisible" userdata="media filter" />
+    </menu_item_check>
    <menu_item_separator />
    <menu_item_call name="Preferences..." label="Preferences..."
                    shortcut="control|P">
@@ -311,10 +322,11 @@
      <on_enable function="View.EnableLastChatter" />
    </menu_item_call>
    <menu_item_separator />
-    <menu_item_call name="Web Browser" label="Web Browser"
+    <menu_item_check name="Web Browser" label="Web Browser"
                    shortcut="control|B">
      <on_click function="ShowFloater" userdata="inworld browser" />
-    </menu_item_call>
+      <on_check function="FloaterVisible" userdata="inworld browser" />
+    </menu_item_check>
    <menu_item_separator />
    <menu_item_check name="Toolbar" label="Toolbar">
      <on_click function="ShowFloater" userdata="toolbar" />
@@ -343,6 +355,11 @@
      <on_click function="ShowFloater" userdata="mute list" />
      <on_check function="FloaterVisible" userdata="mute list" />
    </menu_item_check>
+          <menu_item_check name="Teleport History" label="Teleport History"
+                     shortcut="alt|H">
+                  <on_click function="ShowFloater" userdata="teleport history" />
+                  <on_check function="FloaterVisible" userdata="teleport history" />
+          </menu_item_check>
    <menu_item_separator />
    <menu_item_check name="Camera Controls" label="Camera Controls">
      <on_click function="ShowFloater" userdata="camera controls" />
@@ -903,6 +920,15 @@
                  userdata="notifications" />
      </menu_item_call>
      <menu_item_separator />
+      <menu_item_call name="Message Log" label="Message Log">
+        <on_click function="Advanced.MessageLog"
+                  userdata="MessageLog" />
+      </menu_item_call>
+      <menu_item_call name="Message Builder" label="Message Builder">
+        <on_click function="Advanced.MessageBuilder"
+                  userdata="MessageBuilder" />
+      </menu_item_call>
+      <menu_item_separator />
      <menu_item_call name="Region Info to Debug Console"
                      label="Region Info to Debug Console">
        <on_click function="Advanced.DumpInfoToConsole"
@@ -981,7 +1007,12 @@
      <on_click function="ShowFloater" userdata="animation list" />
      <on_check function="FloaterVisible" userdata="animation list" />
    </menu_item_check>
-                <menu_item_check label="Area Object Search" name="Area Object Search" shortcut="control|shift|A">
+    <menu_item_check label="Full Radar" name="Full Radar">
+      <on_click function="ShowFloater" userdata="full radar" />
+      <on_check function="FloaterVisible" userdata="full radar" />
+    </menu_item_check>
+                <menu_item_check label="Area Object Search" name="Area Object Search" 
+                     shortcut="alt|A">
                        <on_click function="ShowFloater" userdata="areasearch" />
                        <on_check function="FloaterVisible" userdata="areasearch" />
    </menu_item_check>
@@ -1265,6 +1296,18 @@
          <on_check function="Advanced.CheckInfoDisplay"
                    userdata="glow" />
        </menu_item_check>
+        <menu_item_check name="Raycasting" label="Raycasting">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="raycasting" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="raycasting" />
+        </menu_item_check>
+        <menu_item_check name="Sculpt" label="Sculpt">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="sculpt" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="sculpt" />
+        </menu_item_check>
        <menu_item_check name="Vectorize Perf Test"
                         label="Vectorize Perf Test">
          <on_click function="ToggleControl"
@@ -1462,8 +1505,8 @@
        <menu_item_check name="Show Debug Messages"
                         label="Show Debug Messages">
-          <on_click function="ToggleControl" userdata="RestrainedLifeDebug" />
+          <on_click function="ToggleControl" userdata="RestrainedLoveDebug" />
-          <on_check control="RestrainedLifeDebug" />
+          <on_check control="RestrainedLoveDebug" />
        </menu_item_check>
        <menu_item_separator />
@@ -1510,8 +1553,8 @@
      <menu_item_check name="Forbid Give to #RLV" label="Forbid Give to #RLV">
        <on_click function="ToggleControl"
-                  userdata="RestrainedLifeForbidGiveToRLV" />
+                  userdata="RestrainedLoveForbidGiveToRLV" />
-        <on_check control="RestrainedLifeForbidGiveToRLV" />
+        <on_check control="RestrainedLoveForbidGiveToRLV" />
      </menu_item_check>
      <menu_item_check name="Show Name Tags" label="Show Name Tags">
@@ -1549,6 +1592,11 @@
        <on_check control="ShowSearchBar" />
      </menu_item_check>
+        <menu_item_call name="Reload Balance" label="Reload [CURRENCY] balance" shortcut="control|alt|B">
+        <on_click function="Advanced.ReloadBalance" userdata="" />
+      </menu_item_call>
      <menu_item_separator />
      <menu_item_call name="Web Browser Test" label="Web Browser Test">
@@ -1798,7 +1846,7 @@
        <menu_item_call name="Test Female" label="Test Female">
          <on_click function="Advanced.TestFemale" userdata="" />
        </menu_item_call>
-        <menu_item_call name="Toggle PG" label="Toggle PG">
+        <menu_item_call name="Toggle PG" label="Toggle Teen Mode">
          <on_click function="Advanced.TogglePG" userdata="" />
        </menu_item_call>
        <menu_item_check name="Allow Select Avatar"
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_linux.xml
index e3d1021..f0ba830 100644..100755
--- a/linden/indra/newview/skins/default/xui/en-us/mime_types.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/mime_types_linux.xml
@@ -7,7 +7,7 @@
                none
        </defaultwidget>
        <defaultimpl>
-                LLMediaImplLLMozLib
+                media_plugin_webkit
        </defaultimpl>
        <widgetset name="web">
                <label name="web_label">
@@ -55,27 +55,6 @@
                        true
                </allow_looping>
        </widgetset>
-        <widgetset name="none">
-                <label name="none_label">
-                        No Content
-                </label>
-                <default_type>
-                        none/none
-                </default_type>
-                <icon>
-                        icn_media_web.tga
-                </icon>
-                <tooltip name="none_tooltip">
-                        No media here
-                </tooltip>
-                <playtip name="none_playtip" />
-                <allow_resize>
-                        false
-                </allow_resize>
-                <allow_looping>
-                        false
-                </allow_looping>
-        </widgetset>
        <widgetset name="image">
                <label name="image_label">
                        Image
@@ -129,6 +108,9 @@
                <widgettype>
                        movie
                </widgettype>
+                <impl>
+                        media_plugin_gstreamer
+                </impl>
        </scheme>
        <mimetype name="blank">
                <label name="blank_label">
@@ -138,7 +120,7 @@
                        none
                </widgettype>
                <impl>
-                        LLMediaImplQuickTime
+                        media_plugin_webkit
                </impl>
        </mimetype>
        <mimetype name="none/none">
@@ -148,6 +130,9 @@
                <widgettype>
                        none
                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
        </mimetype>
        <mimetype name="audio/*">
                <label name="audio2_label">
@@ -156,6 +141,9 @@
                <widgettype>
                        audio
                </widgettype>
+                <impl>
+                        media_plugin_gstreamer
+                </impl>
        </mimetype>
        <mimetype name="video/*">
                <label name="video2_label">
@@ -164,6 +152,9 @@
                <widgettype>
                        movie
                </widgettype>
+                <impl>
+                        media_plugin_gstreamer
+                </impl>
        </mimetype>
        <mimetype name="image/*">
                <label name="image2_label">
@@ -172,6 +163,9 @@
                <widgettype>
                        image
                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
        </mimetype>
        <mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
                <label name="vnd.secondlife.qt.legacy_label">
@@ -181,7 +175,7 @@
                        movie
                </widgettype>
                <impl>
-                        LLMediaImplQuickTime
+                        media_plugin_gstreamer
                </impl>
        </mimetype>
        <mimetype name="application/javascript">
@@ -191,6 +185,9 @@
                <widgettype>
                        web
                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
        </mimetype>
        <mimetype name="application/ogg">
                <label name="application/ogg_label">
@@ -199,6 +196,9 @@
                <widgettype>
                        audio
                </widgettype>
+                <impl>
+                        media_plugin_gstreamer
+                </impl>
        </mimetype>
        <mimetype name="application/pdf">
                <label name="application/pdf_label">
@@ -207,6 +207,9 @@
                <widgettype>
                        image
                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
        </mimetype>
        <mimetype name="application/postscript">
                <label name="application/postscript_label">
@@ -215,6 +218,9 @@
                <widgettype>
                        image
                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
        </mimetype>
        <mimetype name="application/rtf">
                <label name="application/rtf_label">
@@ -223,14 +229,20 @@
                <widgettype>
                        image
                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
        </mimetype>
        <mimetype name="application/smil">
                <label name="application/smil_label">
-                    Synchronized Multimedia Integration Language (SMIL)
+                        Synchronized Multimedia Integration Language (SMIL)
                </label>
                <widgettype>
                        movie
                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
        </mimetype>
        <mimetype name="application/xhtml+xml">
                <label name="application/xhtml+xml_label">
@@ -239,6 +251,9 @@
                <widgettype>
                        web
                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
        </mimetype>
        <mimetype name="application/x-director">
                <label name="application/x-director_label">
@@ -247,14 +262,9 @@
                <widgettype>
                        image
                </widgettype>
-        </mimetype>
+                <impl>
-        <mimetype name="application/x-shockwave-flash">
+                        media_plugin_webkit
-                <label name="application/x-shockwave-flash_label">
+                </impl>
-                        Flash
-                </label>
-                <widgettype>
-                        image
-                </widgettype>
        </mimetype>
        <mimetype name="audio/mid">
                <label name="audio/mid_label">
@@ -263,6 +273,9 @@
                <widgettype>
                        audio
                </widgettype>
+                <impl>
+                        media_plugin_gstreamer
+                </impl>
        </mimetype>
        <mimetype name="audio/mpeg">
                <label name="audio/mpeg_label">
@@ -271,6 +284,9 @@
                <widgettype>
                        audio
                </widgettype>
+                <impl>
+                        media_plugin_gstreamer
+                </impl>
        </mimetype>
        <mimetype name="audio/x-aiff">
                <label name="audio/x-aiff_label">
@@ -279,6 +295,9 @@
                <widgettype>
                        audio
                </widgettype>
+                <impl>
+                        media_plugin_gstreamer
+                </impl>
        </mimetype>
        <mimetype name="audio/x-wav">
                <label name="audio/x-wav_label">
@@ -287,6 +306,9 @@
                <widgettype>
                        audio
                </widgettype>
+                <impl>
+                        media_plugin_gstreamer
+                </impl>
        </mimetype>
        <mimetype menu="1" name="image/bmp">
                <label name="image/bmp_label">
@@ -296,7 +318,7 @@
                        image
                </widgettype>
                <impl>
-                        LLMediaImplLLMozLib
+                        media_plugin_webkit
                </impl>
        </mimetype>
        <mimetype menu="1" name="image/gif">
@@ -307,7 +329,7 @@
                        image
                </widgettype>
                <impl>
-                        LLMediaImplLLMozLib
+                        media_plugin_webkit
                </impl>
        </mimetype>
        <mimetype menu="1" name="image/jpeg">
@@ -318,7 +340,7 @@
                        image
                </widgettype>
                <impl>
-                        LLMediaImplLLMozLib
+                        media_plugin_webkit
                </impl>
        </mimetype>
        <mimetype menu="1" name="image/png">
@@ -329,7 +351,7 @@
                        image
                </widgettype>
                <impl>
-                        LLMediaImplLLMozLib
+                        media_plugin_webkit
                </impl>
        </mimetype>
        <mimetype name="image/svg+xml">
@@ -340,7 +362,7 @@
                        image
                </widgettype>
                <impl>
-                        LLMediaImplLLMozLib
+                        media_plugin_webkit
                </impl>
        </mimetype>
        <mimetype menu="1" name="image/tiff">
@@ -351,7 +373,7 @@
                        image
                </widgettype>
                <impl>
-                        LLMediaImplLLMozLib
+                        media_plugin_webkit
                </impl>
        </mimetype>
        <mimetype menu="1" name="text/html">
@@ -362,7 +384,7 @@
                        web
                </widgettype>
                <impl>
-                        LLMediaImplLLMozLib
+                        media_plugin_webkit
                </impl>
        </mimetype>
        <mimetype menu="1" name="text/plain">
@@ -373,7 +395,7 @@
                        text
                </widgettype>
                <impl>
-                        LLMediaImplLLMozLib
+                        media_plugin_webkit
                </impl>
        </mimetype>
        <mimetype name="text/xml">
@@ -384,7 +406,7 @@
                        text
                </widgettype>
                <impl>
-                        LLMediaImplLLMozLib
+                        media_plugin_webkit
                </impl>
        </mimetype>
        <mimetype menu="1" name="video/mpeg">
@@ -395,7 +417,7 @@
                        movie
                </widgettype>
                <impl>
-                        LLMediaImplQuickTime
+                        media_plugin_gstreamer
                </impl>
        </mimetype>
        <mimetype name="video/mp4">
@@ -406,7 +428,18 @@
                        movie
                </widgettype>
                <impl>
-                        LLMediaImplQuickTime
+                        media_plugin_gstreamer
+                </impl>
+        </mimetype>
+        <mimetype name="video/x-m4v">
+                <label name="video/m4v_label">
+                        Movie (M4V)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+                        media_plugin_gstreamer
                </impl>
        </mimetype>
        <mimetype menu="1" name="video/quicktime">
@@ -417,7 +450,7 @@
                        movie
                </widgettype>
                <impl>
-                        LLMediaImplQuickTime
+                        media_plugin_gstreamer
                </impl>
        </mimetype>
        <mimetype name="video/x-ms-asf">
@@ -428,7 +461,7 @@
                        movie
                </widgettype>
                <impl>
-                        LLMediaImplQuickTime
+                        media_plugin_gstreamer
                </impl>
        </mimetype>
        <mimetype name="video/x-ms-wmv">
@@ -439,7 +472,7 @@
                        movie
                </widgettype>
                <impl>
-                        LLMediaImplQuickTime
+                        media_plugin_gstreamer
                </impl>
        </mimetype>
        <mimetype menu="1" name="video/x-msvideo">
@@ -450,7 +483,7 @@
                        movie
                </widgettype>
                <impl>
-                        LLMediaImplQuickTime
+                        media_plugin_gstreamer
                </impl>
        </mimetype>
 </mimetypes>
diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml
new file mode 100755
index 0000000..e1751eb
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml
@@ -0,0 +1,489 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<mimetypes name="default">
+        <defaultlabel>
+                (Unknown)
+        </defaultlabel>
+        <defaultwidget>
+                none
+        </defaultwidget>
+        <defaultimpl>
+                media_plugin_webkit
+        </defaultimpl>
+        <widgetset name="web">
+                <label name="web_label">
+                        Web Content
+                </label>
+                <icon>
+                        icn_media_web.tga
+                </icon>
+                <default_type>
+                        text/html
+                </default_type>
+                <tooltip name="web_tooltip">
+                        This location has Web content
+                </tooltip>
+                <playtip name="web_playtip">
+                        Show Web content
+                </playtip>
+                <allow_resize>
+                        true
+                </allow_resize>
+                <allow_looping>
+                        false
+                </allow_looping>
+        </widgetset>
+        <widgetset name="movie">
+                <label name="movie_label">
+                        Movie
+                </label>
+                <default_type>
+                        video/*
+                </default_type>
+                <icon>
+                        icn_media_movie.tga
+                </icon>
+                <tooltip name="movie_tooltip">
+                        There is a movie to play here
+                </tooltip>
+                <playtip name="movie_playtip">
+                        Play movie
+                </playtip>
+                <allow_resize>
+                        false
+                </allow_resize>
+                <allow_looping>
+                        true
+                </allow_looping>
+        </widgetset>
+        <widgetset name="image">
+                <label name="image_label">
+                        Image
+                </label>
+                <icon>
+                        icn_media_web.tga
+                </icon>
+                <default_type>
+                        image/*
+                </default_type>
+                <tooltip name="image_tooltip">
+                        There is an image at this location
+                </tooltip>
+                <playtip name="image_playtip">
+                        View this location&apos;s image
+                </playtip>
+                <allow_resize>
+                        false
+                </allow_resize>
+                <allow_looping>
+                        false
+                </allow_looping>
+        </widgetset>
+        <widgetset name="audio">
+                <label name="audio_label">
+                        Audio
+                </label>
+                <icon>
+                        icn_media_web.tga
+                </icon>
+                <default_type>
+                        audio/*
+                </default_type>
+                <tooltip name="audio_tooltip">
+                        There is audio at this location
+                </tooltip>
+                <playtip name="audio_playtip">
+                        Play this location&apos;s audio
+                </playtip>
+                <allow_resize>
+                        false
+                </allow_resize>
+                <allow_looping>
+                        true
+                </allow_looping>
+        </widgetset>
+        <scheme name="rtsp">
+                <label name="rtsp_label">
+                        Real Time Streaming
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </scheme>
+        <mimetype name="blank">
+                <label name="blank_label">
+                        - None -
+                </label>
+                <widgettype>
+                        none
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </mimetype>
+        <mimetype name="none/none">
+                <label name="none/none_label">
+                        - None -
+                </label>
+                <widgettype>
+                        none
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype name="audio/*">
+                <label name="audio2_label">
+                        Audio
+                </label>
+                <widgettype>
+                        audio
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </mimetype>
+        <mimetype name="video/*">
+                <label name="video2_label">
+                        Video
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </mimetype>
+        <mimetype name="image/*">
+                <label name="image2_label">
+                        Image
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+        <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
+                <label name="vnd.secondlife.qt.legacy_label">
+                        Movie (QuickTime)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </mimetype>
+        <mimetype name="application/javascript">
+                <label name="application/javascript_label">
+                        Javascript
+                </label>
+                <widgettype>
+                        web
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype name="application/ogg">
+                <label name="application/ogg_label">
+                        Ogg Audio/Video
+                </label>
+                <widgettype>
+                        audio
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </mimetype>
+        <mimetype name="application/pdf">
+                <label name="application/pdf_label">
+                        PDF Document
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype name="application/postscript">
+                <label name="application/postscript_label">
+                        Postscript Document
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype name="application/rtf">
+                <label name="application/rtf_label">
+                        Rich Text (RTF)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype name="application/smil">
+                <label name="application/smil_label">
+                        Synchronized Multimedia Integration Language (SMIL)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype name="application/xhtml+xml">
+                <label name="application/xhtml+xml_label">
+                        Web Page (XHTML)
+                </label>
+                <widgettype>
+                        web
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype name="application/x-director">
+                <label name="application/x-director_label">
+                        Macromedia Director
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype name="audio/mid">
+                <label name="audio/mid_label">
+                        Audio (MIDI)
+                </label>
+                <widgettype>
+                        audio
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </mimetype>
+        <mimetype name="audio/mpeg">
+                <label name="audio/mpeg_label">
+                        Audio (MP3)
+                </label>
+                <widgettype>
+                        audio
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </mimetype>
+        <mimetype name="audio/x-aiff">
+                <label name="audio/x-aiff_label">
+                        Audio (AIFF)
+                </label>
+                <widgettype>
+                        audio
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </mimetype>
+        <mimetype name="audio/x-wav">
+                <label name="audio/x-wav_label">
+                        Audio (WAV)
+                </label>
+                <widgettype>
+                        audio
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="image/bmp">
+                <label name="image/bmp_label">
+                        Image (BMP)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="image/gif">
+                <label name="image/gif_label">
+                        Image (GIF)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="image/jpeg">
+                <label name="image/jpeg_label">
+                        Image (JPEG)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="image/png">
+                <label name="image/png_label">
+                        Image (PNG)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype name="image/svg+xml">
+                <label name="image/svg+xml_label">
+                        Image (SVG)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="image/tiff">
+                <label name="image/tiff_label">
+                        Image (TIFF)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="text/html">
+                <label name="text/html_label">
+                        Web Page
+                </label>
+                <widgettype>
+                        web
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="text/plain">
+                <label name="text/plain_label">
+                        Text
+                </label>
+                <widgettype>
+                        text
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype name="text/xml">
+                <label name="text/xml_label">
+                        XML
+                </label>
+                <widgettype>
+                        text
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="video/mpeg">
+                <label name="video/mpeg_label">
+                        Movie (MPEG)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </mimetype>
+        <mimetype name="video/mp4">
+                <label name="video/mp4_label">
+                        Movie (MP4)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </mimetype>
+        <mimetype name="video/x-m4v">
+                <label name="video/m4v_label">
+                        Movie (M4V)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+                        media_plugin_gstreamer
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="video/quicktime">
+                <label name="video/quicktime_label">
+                        Movie (QuickTime)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </mimetype>
+        <mimetype name="video/x-ms-asf">
+                <label name="video/x-ms-asf_label">
+                        Movie (Windows Media ASF)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </mimetype>
+        <mimetype name="video/x-ms-wmv">
+                <label name="video/x-ms-wmv_label">
+                        Movie (Windows Media WMV)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="video/x-msvideo">
+                <label name="video/x-msvideo_label">
+                        Movie (AVI)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </mimetype>
+</mimetypes>
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
new file mode 100644
index 0000000..5217dbe
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml
@@ -0,0 +1,489 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<mimetypes name="default">
+        <defaultlabel>
+                (Unknown)
+        </defaultlabel>
+        <defaultwidget>
+                none
+        </defaultwidget>
+        <defaultimpl>
+                media_plugin_webkit
+        </defaultimpl>
+        <widgetset name="web">
+                <label name="web_label">
+                        Web Content
+                </label>
+                <icon>
+                        icn_media_web.tga
+                </icon>
+                <default_type>
+                        text/html
+                </default_type>
+                <tooltip name="web_tooltip">
+                        This location has Web content
+                </tooltip>
+                <playtip name="web_playtip">
+                        Show Web content
+                </playtip>
+                <allow_resize>
+                        true
+                </allow_resize>
+                <allow_looping>
+                        false
+                </allow_looping>
+        </widgetset>
+        <widgetset name="movie">
+                <label name="movie_label">
+                        Movie
+                </label>
+                <default_type>
+                        video/*
+                </default_type>
+                <icon>
+                        icn_media_movie.tga
+                </icon>
+                <tooltip name="movie_tooltip">
+                        There is a movie to play here
+                </tooltip>
+                <playtip name="movie_playtip">
+                        Play movie
+                </playtip>
+                <allow_resize>
+                        false
+                </allow_resize>
+                <allow_looping>
+                        true
+                </allow_looping>
+        </widgetset>
+        <widgetset name="image">
+                <label name="image_label">
+                        Image
+                </label>
+                <icon>
+                        icn_media_web.tga
+                </icon>
+                <default_type>
+                        image/*
+                </default_type>
+                <tooltip name="image_tooltip">
+                        There is an image at this location
+                </tooltip>
+                <playtip name="image_playtip">
+                        View this location&apos;s image
+                </playtip>
+                <allow_resize>
+                        false
+                </allow_resize>
+                <allow_looping>
+                        false
+                </allow_looping>
+        </widgetset>
+        <widgetset name="audio">
+                <label name="audio_label">
+                        Audio
+                </label>
+                <icon>
+                        icn_media_web.tga
+                </icon>
+                <default_type>
+                        audio/*
+                </default_type>
+                <tooltip name="audio_tooltip">
+                        There is audio at this location
+                </tooltip>
+                <playtip name="audio_playtip">
+                        Play this location&apos;s audio
+                </playtip>
+                <allow_resize>
+                        false
+                </allow_resize>
+                <allow_looping>
+                        true
+                </allow_looping>
+        </widgetset>
+        <scheme name="rtsp">
+                <label name="rtsp_label">
+                        Real Time Streaming
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </scheme>
+        <mimetype name="blank">
+                <label name="blank_label">
+                        - None -
+                </label>
+                <widgettype>
+                        none
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype name="none/none">
+                <label name="none/none_label">
+                        - None -
+                </label>
+                <widgettype>
+                        none
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype name="audio/*">
+                <label name="audio2_label">
+                        Audio
+                </label>
+                <widgettype>
+                        audio
+                </widgettype>
+                <impl>
+                        media_plugin_gstreamer010
+                </impl>
+        </mimetype>
+        <mimetype name="video/*">
+                <label name="video2_label">
+                        Video
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </mimetype>
+        <mimetype name="image/*">
+                <label name="image2_label">
+                        Image
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
+                <label name="vnd.secondlife.qt.legacy_label">
+                        Movie (QuickTime)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+      media_plugin_quicktime
+    </impl>
+        </mimetype>
+        <mimetype name="application/javascript">
+                <label name="application/javascript_label">
+                        Javascript
+                </label>
+                <widgettype>
+                        web
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype name="application/ogg">
+                <label name="application/ogg_label">
+                        Ogg Audio/Video
+                </label>
+                <widgettype>
+                        audio
+                </widgettype>
+                <impl>
+      media_plugin_gstreamer010
+    </impl>
+        </mimetype>
+        <mimetype name="application/pdf">
+                <label name="application/pdf_label">
+                        PDF Document
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype name="application/postscript">
+                <label name="application/postscript_label">
+                        Postscript Document
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype name="application/rtf">
+                <label name="application/rtf_label">
+                        Rich Text (RTF)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype name="application/smil">
+                <label name="application/smil_label">
+                    Synchronized Multimedia Integration Language (SMIL)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype name="application/xhtml+xml">
+                <label name="application/xhtml+xml_label">
+                        Web Page (XHTML)
+                </label>
+                <widgettype>
+                        web
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype name="application/x-director">
+                <label name="application/x-director_label">
+                        Macromedia Director
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype name="audio/mid">
+                <label name="audio/mid_label">
+                        Audio (MIDI)
+                </label>
+                <widgettype>
+                        audio
+                </widgettype>
+                <impl>
+      media_plugin_gstreamer010
+    </impl>
+        </mimetype>
+        <mimetype name="audio/mpeg">
+                <label name="audio/mpeg_label">
+                        Audio (MP3)
+                </label>
+                <widgettype>
+                        audio
+                </widgettype>
+                <impl>
+      media_plugin_gstreamer010
+    </impl>
+        </mimetype>
+        <mimetype name="audio/x-aiff">
+                <label name="audio/x-aiff_label">
+                        Audio (AIFF)
+                </label>
+                <widgettype>
+                        audio
+                </widgettype>
+                <impl>
+      media_plugin_gstreamer010
+    </impl>
+        </mimetype>
+        <mimetype name="audio/x-wav">
+                <label name="audio/x-wav_label">
+                        Audio (WAV)
+                </label>
+                <widgettype>
+                        audio
+                </widgettype>
+                <impl>
+      media_plugin_gstreamer010
+    </impl>
+        </mimetype>
+        <mimetype menu="1" name="image/bmp">
+                <label name="image/bmp_label">
+                        Image (BMP)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="image/gif">
+                <label name="image/gif_label">
+                        Image (GIF)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="image/jpeg">
+                <label name="image/jpeg_label">
+                        Image (JPEG)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="image/png">
+                <label name="image/png_label">
+                        Image (PNG)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype name="image/svg+xml">
+                <label name="image/svg+xml_label">
+                        Image (SVG)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="image/tiff">
+                <label name="image/tiff_label">
+                        Image (TIFF)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="text/html">
+                <label name="text/html_label">
+                        Web Page
+                </label>
+                <widgettype>
+                        web
+                </widgettype>
+                <impl>
+      media_plugin_webkit
+    </impl>
+        </mimetype>
+        <mimetype menu="1" name="text/plain">
+                <label name="text/plain_label">
+                        Text
+                </label>
+                <widgettype>
+                        text
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype name="text/xml">
+                <label name="text/xml_label">
+                        XML
+                </label>
+                <widgettype>
+                        text
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="video/mpeg">
+                <label name="video/mpeg_label">
+                        Movie (MPEG)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+      media_plugin_quicktime
+    </impl>
+        </mimetype>
+        <mimetype name="video/mp4">
+                <label name="video/mp4_label">
+                        Movie (MP4)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </mimetype>
+        <mimetype name="video/x-m4v">
+                <label name="video/m4v_label">
+                        Movie (M4V)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+      media_plugin_quicktime
+    </impl>
+        </mimetype>
+        <mimetype menu="1" name="video/quicktime">
+                <label name="video/quicktime_label">
+                        Movie (QuickTime)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+      media_plugin_quicktime
+    </impl>
+        </mimetype>
+        <mimetype name="video/x-ms-asf">
+                <label name="video/x-ms-asf_label">
+                        Movie (Windows Media ASF)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+      media_plugin_quicktime
+    </impl>
+        </mimetype>
+        <mimetype name="video/x-ms-wmv">
+                <label name="video/x-ms-wmv_label">
+                        Movie (Windows Media WMV)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+      media_plugin_quicktime
+    </impl>
+        </mimetype>
+        <mimetype menu="1" name="video/x-msvideo">
+                <label name="video/x-msvideo_label">
+                        Movie (AVI)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+      media_plugin_quicktime
+    </impl>
+        </mimetype>
+</mimetypes>
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 5a8ef78..439b102 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -1729,6 +1729,15 @@ Cannot find the region this land is in.
 <notification
 icon="alertmodal.tga"
+ name="CannotBuyLandMaturity"
+ type="alertmodal">
+Unable to buy land:
+Your allowed/preferred maturity level does not permit you to buy this land. You may need to your maturity level in Preferences first.
+</notification>
+<notification
+ icon="alertmodal.tga"
 name="CannotCloseFloaterBuyLand"
 type="alertmodal">
 You cannot close the Buy Land window until [GRID_NAME] estimates the price of this transaction.
@@ -3644,6 +3653,16 @@ Default: off
 <notification
 icon="alertmodal.tga"
+ label="Minimum Age"
+ name="HelpRegionMinimumAge"
+ type="alertmodal">
+This sets the minimum age (in days) that users entering this sim have to be to enter.
+Default: 0 (disabled)
+</notification>
+<notification
+ icon="alertmodal.tga"
 label="Block Fly"
 name="HelpRegionBlockFly"
 type="alertmodal">
@@ -3654,6 +3673,90 @@ Default: off
 <notification
 icon="alertmodal.tga"
+ label="Force Draw Distance"
+ name="HelpForceDrawDistance"
+ type="alertmodal">
+If this box is checked, draw distance will be locked for all people in the sim. Note: This will lag people on older machines. PLEASE think before setting this setting.
+Default: off
+</notification>
+<notification
+ icon="alertmodal.tga"
+ label="Max Inventory Items To Transfer"
+ name="HelpMaxInventoryItemsTransfer"
+ type="alertmodal">
+This box controls how many objects can be transfered between clients at a time. -1 sets no limit on the amount of objects. Default Second Life setting is 42.
+Default: -1
+</notification>
+<notification
+ icon="alertmodal.tga"
+ label="Max Groups"
+ name="HelpMaxGroups"
+ type="alertmodal">
+This box controls how many groups an agent can join. -1 sets no limit on the amount of groups.
+Default: -1
+</notification>
+  <notification
+   icon="alertmodal.tga"
+   label="Render Water"
+   name="HelpRenderWater"
+   type="alertmodal">
+    If this box is checked, water will not be shown for users in this sim.
+    Default: -1
+  </notification>
+<notification
+ icon="alertmodal.tga"
+ label="Allow Minimap"
+ name="HelpAllowMinimap"
+ type="alertmodal">
+If this box is checked, the minimap will be disabled for users in this sim.
+Default: on
+</notification>
+<notification
+ icon="alertmodal.tga"
+ label="Allow Minimap"
+ name="HelpAllowPhysicalPrims"
+ type="alertmodal">
+If this box is checked, physical prims will be allowed to be created in this sim.
+Default: on
+</notification>
+<notification
+ icon="alertmodal.tga"
+ label="Enable Teen Mode"
+ name="HelpEnableTeenMode"
+ type="alertmodal">
+If this box is checked, all avatars will be forced to wear underwear and will not be able to take it off.
+Default: off
+</notification>
+<notification
+ icon="alertmodal.tga"
+ label="Show Tags"
+ name="HelpShowTags"
+ type="alertmodal">
+This box controls how avatar name tags are shown in this sim. 2 sets tags to always be shown. 1 sets tags to disappear after some time. 0 blocks the viewing of name tags.
+Default: 2
+</notification>
+<notification
+ icon="alertmodal.tga"
+ label="Allow Parcel WindLight"
+ name="HelpAllowParcelWindLight"
+ type="alertmodal">
+If this box is checked, setting WindLight settings in parcels will be enabled.
+Default: on
+</notification>
+<notification
+ icon="alertmodal.tga"
 label="Bulk Change Content Permissions"
 name="HelpBulkPermission"
 type="alertmodal">
@@ -5134,6 +5237,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">
@@ -5547,7 +5732,25 @@ Apple&apos;s QuickTime software does not appear to be installed on your system.
 If you want to view streaming media on parcels that support it you should go to the QuickTime site (http://www.apple.com/quicktime) and install the QuickTime Player.
 </notification>
+<notification
+ icon="notify.tga"
+ name="NoPlugin"
+ type="notify">
+No Media Plugin was found to handle the "[MIME_TYPE]" mime type.  Media of this type will be unavailable.
+</notification>
+<notification
+ icon="alertmodal.tga"
+ name="MediaPluginFailed"
+ type="alertmodal">
+The following Media Plugin has failed:
+[PLUGIN]
+Please re-install the plugin or contact the vendor if you continue to experience problems.
+    <form name="form">
+      <ignore name="ignore"
+       text="When a Media Plugin fails"/>
+    </form>
+</notification>
 <notification
 icon="notify.tga"
 name="OwnedObjectsReturned"
@@ -6000,8 +6203,12 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ
     index="1"
     name="Decline"
     text="Decline"/>
+    <button 
+      index="2" 
+      name="Profile" 
+      text="Profile"/>
    <button
-     index="2"
+     index="3"
     name="Ignore"
     text="Ignore"/>
  </form>
@@ -6024,7 +6231,11 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ
     name="Decline"
     text="Decline"/>
    <button
-     index="2"
+    index="2"
+    name="Profile"
+    text="Profile"/>
+    <button
+     index="3"
     name="Ignore"
     text="Ignore"/>
  </form>
@@ -6745,7 +6956,7 @@ GRAVITY  --  -9.8
 *  --  Multiplication
 \  --  Division
-+  --  Addition
+  --  Addition
 -  --  Subtraction
 For information about this feature, click "More Info".
@@ -6774,7 +6985,7 @@ GLOW --  Glow
 *  --  Multiplication
 \  --  Division
-+  --  Addition
+  --  Addition
 -  --  Subtraction
 For information about this feature, click "More Info".
@@ -6800,6 +7011,20 @@ Are you sure you want to move here?
 </notification>
 <notification
+ icon="alert.tga"
+ name="ConfirmDerender"
+ type="alert">
+Are you sure you want to derender [NAME]?
+[NAME] will be hidden until you exit the region or they change outfits.
+  <usetemplate
+    ignoretext="When using derender"
+    name="okcancelignore"
+    notext="Cancel"
+    yestext="Derender"/>
+</notification>
+<notification
 icon="alertmodal.tga"
 name="ConfirmDoubleClickTP"
 type="alertmodal">
@@ -6931,11 +7156,14 @@ You need to specify a unique grid nickname.
 <notification
 icon="alertmodal.tga"
- name="GridsNoLoginUri"
+ name="GridInfoDirty"
 type="alertmodal">
-Cannot save new grid '[NAME]'.
+You have unsaved changes that will be lost. Continue?
+  <usetemplate
-You need to specify a login URI.
+   ignoretext="When creating new grids"
+   name="okcancelignore"
+   notext="Cancel"
+   yestext="Continue"/>
 </notification>
 <notification
@@ -6948,6 +7176,13 @@ A grid with the same nickname already exists.
 </notification>
 <notification
+  icon="alertmodal.tga"
+  name="GridInfoNoLoginUri"
+  type="alertmodal">
+  A login URI is required to retrieve the grid info.
+</notification>
+  
+<notification
 icon="alertmodal.tga"
 name="GridInfoNoLoginUri"
 type="alertmodal">
@@ -6972,11 +7207,45 @@ IM history could not be found for [NAME].
 </notification>
 <notification
+  icon="alertmodal.tga"
+  name="InvalidLogInSecondLife"
+  type="alertmodal">
+Oops! The login name you entered wasn't formatted correctly!
+[SECOND_LIFE] accepts the following login formats:
+ - username
+ - username.Resident
+ - firstname.lastname
+If you don't have an account, would you like to create one now?
+  <usetemplate
+   name="okcancelbuttons"
+   notext="Try again"
+   yestext="Create an account"/>
+</notification>
+<notification
+  icon="alertmodal.tga"
+  name="InvalidPassword"
+  type="alertmodal">
+You have entered an invalid password! Please try again.
+</notification>
+  
+<notification
+   icon="notifytip.tga"
+   name="IncompleteInventoryItem"
+   type="notifytip">
+The item you are accessing is not yet locally available. Please try again in a minute.
+</notification>
+  
+<notification
 icon="alert.tga"
 name="ShowLookAtInfo"
 type="alert">
 Show Look At is a debug setting that displays where an avatar's head is looking. Be aware: this will *NOT* show where an avatar's camera is actually pointed. This setting should not be relied on for any form of privacy!
  <usetemplate
+   ignoretext="When setting Show Look At"
   name="okignore"
   yestext="OK"/>
 </notification>
@@ -7039,11 +7308,29 @@ Note: To comply with the Second Life Terms of Service, Imprudence did not downlo
 </notification>
 <notification
+ icon="alert.tga"
+ name="Help_CmdLine"
+ type="alert">
+Various options for command line features.
+To use a command, type it in your chat bar (Local Chat) and press enter.
+</notification>
+  
+<notification
+ icon="alertmodal.tga"
+ label="Spell Check Help"
+ name="EmeraldHelp_SpellCheck"
+ type="alertmodal">
+To Spell Check a word, right click on it and choose its replacement.
+You may choose a base dictionary which stores the language style and basic words
+You may also choose to install other word lists by choosing them from the list and "Install"
+</notification>
+<notification
 name="ConfirmLightShare"
 type="notify"
 icon="notify.tga">
 This region is broadcasting custom sky and water settings.
 Apply this region's settings? (&quot;Ignore&quot; will ignore all region settings until you leave this region.)
  <form name="form">
    <button index="0" name="apply"  text="Apply"/>
@@ -7076,8 +7363,143 @@ The Second Life Terms of Service do not allow you to opt out. By logging in to S
   notext="Cancel"/>
 </notification>
-<!--End Imprudence notifications-->
+  <notification
+   icon="alert.tga"
+   name="MediaAlert"
+   type="alert">
+The owner of this parcel has requested the following [TYPE] URL to be loaded by your viewer:
+[URL]
+You may choose to allow or deny the corresponding domain or in-world scripted object server:
+[DOMAIN]
+"Allow" and "Deny" apply only for this session, while "Blacklist" and "Whitelist" apply forever.
+   <form name="form">
+    <button
+         index="0"
+         name="Allow"
+         text="Allow"/>
+        <button
+         index="1"
+         name="Deny"
+         text="Deny"/>
+        <button
+         index="2"
+         name="Blacklist"
+         text="Blacklist"/>
+        <button
+         index="3"
+         name="Whitelist"
+         text="Whitelist"/>
+   </form>
+  </notification>
+  <notification
+   icon="alert.tga"
+   name="MediaListed"
+   type="alert">
+Media/audio URLs for [DOMAIN] now [LISTED]
+  </notification>
+  <notification
+   icon="notifytip.tga"
+   name="MediaBlocked"
+   type="notifytip">
+Media/audio URL blocked for [DOMAIN]
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="MediaFiltersCleared"
+   type="alertmodal">
+The media filters have been cleared
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="ProxyNeedRestart"
+   type="alertmodal">
+Socks proxy settings will take effect after you restart [VIEWER_NAME].
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_CONNECT_OK"
+   type="alertmodal">
+Connection to Socks5 proxy [PROXY] was successful.
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_NOT_PERMITTED"
+   type="alertmodal">
+The Socks5 proxy "[PROXY]" refused the connection, not allowed by rule set
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_CONNECT_ERROR"
+   type="alertmodal">
+The Socks5 proxy "[PROXY]" refused the connection, could not open TCP channel
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_NOT_ACCEPTABLE"
+   type="alertmodal">
+The Socks5 proxy "[PROXY]" refused the selected authentication system
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_AUTH_FAIL"
+   type="alertmodal">
+The Socks5 proxy "[PROXY]" reported your credentials are invalid
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_UDP_FWD_NOT_GRANTED"
+   type="alertmodal">
+The Socks5 proxy "[PROXY]" refused the UDP associate request
+  </notification>
+  <notification
+   icon="alert.tga"
+   name="SOCKS_HOST_CONNECT_FAILED"
+   type="alert">
+Could not connect to Socks5 proxy server "[PROXY]"
+  </notification>
+<!--End Imprudence notifications-->
+ <!-- [KITTY VIEWER] -->
+  <notification
+   icon="alertmodal.tga"
+   name="KittyInvalidWaterlightNotecard"
+   type="alert">
+[NAME] is not a valid water settings asset.
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="KittyInvalidWindlightNotecard"
+   type="alert">
+[NAME] is not a valid WindLight settings asset.
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="KittyWLSaveNotecardAlert"
+   type="alertmodal">
+Do you wish to overwrite the saved preset?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
+ <!-- [/KITTY VIEWER] -->
 <global name="UnsupportedCPU">
 - Your CPU speed does not meet the minimum requirements.
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 5c794c0..f459e6a 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
@@ -54,30 +54,30 @@
                             mouse_opaque="true" name="online_no" v_pad="0" width="200">
        Currently: Offline
      </text>
-      <button bottom_delta="-19" font="SansSerif" halign="center" height="20"
+      <button bottom_delta="-23" font="SansSerif" halign="center" height="22"
                             label="Instant Message..." label_selected="Instant Message..."
                             right="-12" mouse_opaque="true" name="Instant Message..."
                             tool_tip="Instant Message (IM)" width="145" />
-      <button bottom_delta="-23" font="SansSerif" halign="center" height="20"
+      <button bottom_delta="-26" font="SansSerif" halign="center" height="22"
                             label="Offer Teleport..." label_selected="Offer Teleport..."
                             left_delta="0" mouse_opaque="true" name="Offer Teleport..." width="145" />
-      <button bottom_delta="-34" font="SansSerif" halign="center" height="20"
+      <button bottom_delta="-26" font="SansSerif" halign="center" height="22"
                             label="Add to Friends..." label_selected="Add to Friends..." left_delta="0"
                             mouse_opaque="true" name="Add Friend..." width="145" />
-      <button bottom_delta="-23" font="SansSerif" halign="center" height="20"
+      <button bottom_delta="-26" font="SansSerif" halign="center" height="22"
                             label="Invite to Group..." label_selected="Invite to Group..." left_delta="0"
                             mouse_opaque="true" name="Invite to Group..." width="145" />
-      <button bottom_delta="-23" font="SansSerif" halign="center" height="20" label="Find on Map"
+      <button bottom_delta="-26" font="SansSerif" halign="center" height="22" label="Find on Map"
                             label_selected="Find on Map" left_delta="0" mouse_opaque="true"
                             name="Find on Map" width="145" />
-      <button bottom_delta="-34" font="SansSerif" halign="center" height="20" label="Pay..."
+      <button bottom_delta="-26" font="SansSerif" halign="center" height="22" label="Pay..."
                             label_selected="Pay..." left_delta="0" mouse_opaque="true" name="Pay..."
                             width="145" />
-      <button bottom_delta="-23" font="SansSerif" halign="center" height="20" label="Mute"
+      <button bottom_delta="-26" font="SansSerif" halign="center" height="22" label="Mute"
                             label_selected="Mute" left_delta="0" mouse_opaque="true" name="Mute"
                             width="145" />
      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-25" drop_shadow_visible="true" follows="left|top"
+                             bottom="-227" drop_shadow_visible="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-12"
                             mouse_opaque="true" name="label" v_pad="0" width="145">
        Born:
@@ -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" />
@@ -138,12 +143,12 @@
                             bottom_delta="-6" drop_shadow_visible="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
                             mouse_opaque="true" name="About:" v_pad="0" width="170">
-        About (500 chars):
+        About (8196 chars):
      </text>
      <text_editor bottom_delta="-137" embedded_items="false"
                             enabled="true" follows="left|top" font="SansSerifSmall" height="137"
-                             is_unicode="false" left_delta="0" max_length="511" mouse_opaque="true"
+                             is_unicode="false" left_delta="0" max_length="8196" mouse_opaque="true"
-                             name="about" width="235" word_wrap="true" />
+                             name="about" width="235" word_wrap="true" spell_check="true" />
      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
@@ -243,7 +248,7 @@
      <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
                             initial_value="false" label="Hire" left_delta="170" mouse_opaque="true"
                             name="chk7" width="92" />
-      <line_editor bevel_style="in" border_style="line"
+      <line_editor bevel_style="in" border_style="line" spell_check="true"
                             border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
                             font="SansSerifSmall" height="16" is_unicode="false" left="80"
                             max_length="254" mouse_opaque="true" name="want_to_edit"
@@ -272,7 +277,7 @@
      <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
                             initial_value="false" label="Custom Characters" left_delta="170"
                             mouse_opaque="true" name="schk5" width="127" />
-      <line_editor bevel_style="in" border_style="line"
+      <line_editor bevel_style="in" border_style="line" spell_check="true"
                             border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
                             font="SansSerifSmall" height="16" is_unicode="false" left="80"
                             max_length="254" mouse_opaque="true" name="skills_edit"
@@ -283,7 +288,7 @@
                             mouse_opaque="true" name="Languages:" v_pad="0" width="70">
        Languages:
      </text>
-      <line_editor bevel_style="in" border_style="line"
+      <line_editor bevel_style="in" border_style="line" spell_check="true"
                             border_thickness="1" bottom_delta="0" enabled="true" follows="left|top"
                             font="SansSerifSmall" height="16" is_unicode="false" left="80"
                             max_length="254" mouse_opaque="true" name="languages_edit"
@@ -350,12 +355,12 @@
                             bottom_delta="-8" drop_shadow_visible="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
                             mouse_opaque="true" name="Info:" v_pad="0" width="161">
-        Info (250 chars):
+        Info (8196 chars):
      </text>
      <text_editor bottom_delta="-179" embedded_items="false"
                             enabled="true" follows="left|top" font="SansSerifSmall" height="178"
-                             is_unicode="false" left="12" max_length="254" mouse_opaque="false"
+                             is_unicode="false" left="12" max_length="8196" mouse_opaque="false"
-                             name="about" width="378" word_wrap="true" />
+                             name="about" width="378" word_wrap="true" spell_check="true" />
    </panel>
    <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
                     label="My Notes" left="1" mouse_opaque="true" name="My Notes" width="418">
@@ -372,8 +377,8 @@
      </text>
      <text_editor bottom_delta="-260" embedded_items="false" enabled="true" follows="left|top"
                             font="SansSerif" height="256" is_unicode="false" left="10"
-                             max_length="1023" mouse_opaque="true" name="notes edit" width="400"
+                             max_length="8196" mouse_opaque="true" name="notes edit" width="400"
-                             word_wrap="false" />
+                             word_wrap="false" spell_check="true" />
    </panel>
  </tab_container>
  <button bottom="-508" font="SansSerif" halign="center" height="20" label="OK"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_avatar_classified.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar_classified.xml
index 5789474..f985b35 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_avatar_classified.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar_classified.xml
@@ -3,13 +3,13 @@
     name="Classified" title="Classified" width="350">
        <texture_picker bottom="-165" follows="left|top" height="155" left="10" name="snapshot_ctrl"
             width="207" />
-        <line_editor bottom_delta="-8" enabled="false" follows="left|top"
+        <line_editor bottom_delta="-8" enabled="false" follows="left|top" spell_check="true"
             font="SansSerif" height="20" left="10" name="given_name_editor"
             tool_tip="Name must begin with a letter or number, not punctuation."
             width="280" />
        <text_editor enabled="false" follows="left|top"
             font="SansSerifSmall" height="70" left="10" max_length="1023"
-             name="desc_editor" width="280" word_wrap="true" />
+             name="desc_editor" width="280" word_wrap="true" spell_check="true" />
        <line_editor enabled="false" follows="left|top"
             font="SansSerifSmall" height="20" left="10" name="location_editor"
             tool_tip="Set the location for this classified to your current position."
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_avatar_pick.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar_pick.xml
index af8b58c..9e67252 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_avatar_pick.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar_pick.xml
@@ -8,7 +8,7 @@
             width="290" />
        <text_editor enabled="false" follows="left|top"
             font="SansSerifSmall" height="100" left="10" max_length="1023"
-             name="desc_editor" width="290" word_wrap="true" />
+             name="desc_editor" width="290" word_wrap="true" spell_check="true" />
        <line_editor enabled="false" follows="left|top"
             font="SansSerifSmall" height="20" left="10" name="location_editor"
             width="290" />
@@ -23,7 +23,7 @@
                Sort:
        </text>
        <line_editor bottom_delta="5" follows="left|top" height="16" left="280"
-             name="sort_order_editor" width="25" />
+             name="sort_order_editor" width="25" spell_check="true" />
        <check_box bottom_delta="0" follows="left|top" height="20" label="Enabled" left="360"
             name="enabled_check" width="80" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_bars.xml b/linden/indra/newview/skins/default/xui/en-us/panel_bars.xml
index 4a13604..aab98db 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_bars.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_bars.xml
@@ -15,7 +15,4 @@
                <layout_panel auto_resize="false" filename="panel_toolbar.xml" name="toolbar"
                     use_bounding_rect="true" user_resize="false" width="1024" min_height="28" />
        </layout_stack>
-        <panel auto_resize="true" background_visible="false" bottom="50"
-             follows="left|right|top|bottom" height="728" left="0" mouse_opaque="false"
-             name="hud" user_resize="false" width="1024" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
index 780da86..dd5bf2d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
@@ -13,7 +13,7 @@
                         max_val="1000000" min_val="0" mouse_opaque="true" name="channel_control"
                         width="100" tool_tip="Set the default channel for inworld chat"/>
        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-23"
-             follows="left|right|bottom" font="SansSerif"
+             follows="left|right|bottom" font="SansSerif" spell_check="true"
             handle_edit_keys_directly="false" height="20" label="Click here to chat."
             left="212" max_length="254" name="Chat Editor"
             select_all_on_focus_received="false" select_on_focus="false" tab_group="1"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_classified.xml b/linden/indra/newview/skins/default/xui/en-us/panel_classified.xml
index 3c292e9..ecfa468 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_classified.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_classified.xml
@@ -6,10 +6,10 @@
        <line_editor bottom_delta="-8" enabled="false" follows="left|top"
             font="SansSerif" height="20" left="20" name="given_name_editor"
             tool_tip="Name must begin with a letter or number, not punctuation."
-             width="400" />
+             width="400" spell_check="true" />
        <text_editor enabled="false" follows="left|top"
             font="SansSerifSmall" height="90" left="20" max_length="1023"
-             name="desc_editor"  width="400" word_wrap="true" />
+             name="desc_editor"  width="400" word_wrap="true" spell_check="true" />
        <line_editor enabled="false" follows="left|top" font="SansSerif"
             height="20" left="20" name="location_editor" 
             tool_tip="Set the location for this classified to your current position."
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_event.xml b/linden/indra/newview/skins/default/xui/en-us/panel_event.xml
index 99156ee..6fa8904 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_event.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_event.xml
@@ -75,7 +75,7 @@
                Description:
        </text>
        <text_editor bottom_delta="-230" follows="left|top" height="220" left="20" max_length="1024"
-             name="event_desc" width="400" />
+             name="event_desc" width="400" spell_check="true" />
        <button bottom_delta="-24" follows="left|top" height="20" label="Teleport" left="20"
             name="teleport_btn" width="140" />
        <button bottom_delta="0" follows="left|top" height="20" label="Show on Map" left="165"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_friends.xml b/linden/indra/newview/skins/default/xui/en-us/panel_friends.xml
index bf7acd4..a64560f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_friends.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_friends.xml
@@ -3,41 +3,46 @@
        <string name="Multiple">
                Multiple friends...
        </string>
-        <scroll_list bottom="10" can_resize="true" column_padding="0" draw_heading="true"
+  <scroll_list bottom="10" can_resize="true" column_padding="0" draw_heading="true"
             follows="left|top|bottom|right" left="10" multi_select="true"
             name="friend_list" right="-100" search_column="1"
             tool_tip="Hold shift or control while clicking to select multiple friends"
-             top="-10">
+             top="-30">
-                <column image="ff_online_status_button.tga" name="icon_online_status"
+    <column image="ff_online_status_button.tga" name="icon_online_status"
                     tool_tip="Online status" width="20" />
-                <column dynamicwidth="true" label="Name" name="friend_name" tool_tip="Name" />
+    <column dynamicwidth="true" label="Name" name="friend_name" tool_tip="Name" />
-                <column image="ff_visible_online_button.tga" name="icon_visible_online"
+    <column image="ff_visible_online_button.tga" name="icon_visible_online"
                     tool_tip="Friend can see when you&apos;re online" width="20" />
-                <column image="ff_visible_map_button.tga" name="icon_visible_map"
+    <column image="ff_visible_map_button.tga" name="icon_visible_map"
                     tool_tip="Friend can locate you on the map" width="20" />
-                <column image="ff_edit_mine_button.tga" name="icon_edit_mine"
+    <column image="ff_edit_mine_button.tga" name="icon_edit_mine"
                     tool_tip="Friend can edit, delete or take objects" width="20" />
-                <column image="ff_edit_theirs_button.tga" name="icon_edit_theirs"
+    <column image="ff_visible_map_button.tga" name="icon_visible_map_theirs"
+                     tool_tip="You can  locate this friend on the map" width="20" />
+    <column image="ff_edit_theirs_button.tga" name="icon_edit_theirs"
                     tool_tip="You can edit this friend&apos;s objects" width="20" />
-                <column name="friend_last_update_generation" width="0" />
+    <column name="friend_last_update_generation" width="0" />
-        </scroll_list>
+  </scroll_list>
-        <pad bottom="-7" height="0" left="-90" width="1" />
+  <pad bottom="-7" height="0" left="-90" width="1" />
-        <button bottom_delta="-25" follows="top|right" height="22" label="IM/Call"
+  <button bottom_delta="-45" follows="top|right" height="22" label="IM/Call"
             left_delta="0" name="im_btn" tool_tip="Open Instant Message session"
             width="80" />
-        <button bottom_delta="-25" follows="top|right" height="22" label="Profile"
+  <button bottom_delta="-25" follows="top|right" height="22" label="Profile"
             left_delta="0" name="profile_btn"
             tool_tip="Show picture, groups, and other information" width="80" />
-        <button bottom_delta="-25" follows="top|right" height="22" label="Teleport..."
+  <button bottom_delta="-25" follows="top|right" height="22" label="Teleport..."
             left_delta="0" name="offer_teleport_btn"
             tool_tip="Offer this friend a teleport to your current location" width="80" />
-        <button bottom_delta="-25" follows="top|right" height="22" label="Pay..."
+  <button bottom_delta="-25" follows="top|right" height="22" label="Pay..."
             left_delta="0" name="pay_btn"
             tool_tip="Give currency to this friend" width="80" />
-        <button bottom_delta="-25" follows="top|right" height="22" label="Remove..."
+  <button bottom_delta="-25" follows="top|right" height="22" label="Remove..."
             left_delta="0" name="remove_btn"
             tool_tip="Remove this person from your friends list" width="80" />
-        <button bottom_delta="-35" follows="top|right" height="22" label="Add..."
+  <button bottom_delta="-35" follows="top|right" height="22" label="Add..."
             left_delta="0" name="add_btn" tool_tip="Offer friendship to a resident"
             width="80" />
+  <search_editor bottom="-24" enabled="true" follows="left|right|top" font="SansSerif"
+       height="18" left="10" right="-100" name="buddy_search"
+       label="Type here to search your friends" width="130" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml
index a967a90..b032b09 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml
@@ -18,10 +18,10 @@ Hover your mouse over the options for more help.
             bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
             h_pad="0" halign="left" height="16" label="Type your new group name here"
             left="7" max_length="35" mouse_opaque="true" name="group_name_editor"
-             prevalidate="ascii" v_pad="0" width="300" />
+             prevalidate="ascii" v_pad="0" width="300" spell_check="true" />
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-20" drop_shadow_visible="true" follows="left|top"
-             font="SansSerifBig" h_pad="0" halign="left" height="16" left="7"
+             font="SansSerifLarge" h_pad="0" halign="left" height="16" left="7"
             mouse_opaque="true" name="group_name" v_pad="0" width="300">
                Type your new group name here
        </text>
@@ -47,7 +47,7 @@ Hover your mouse over the options for more help.
             font="SansSerifSmall" h_pad="0" halign="left" height="160"
             hide_scrollbar="true" max_length="511" mouse_opaque="true" name="charter"
             right="410" v_pad="0"
-             width="265" word_wrap="true">
+             width="265" word_wrap="true" spell_check="true">
                Group Charter
        </text_editor>
        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
index 9341d4b..b5f7b37 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
@@ -18,7 +18,7 @@
        </string>
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-20" drop_shadow_visible="true" follows="left|top"
-             font="SansSerifBig" h_pad="0" halign="left" height="16" left="7"
+             font="SansSerifLarge" h_pad="0" halign="left" height="16" left="7"
             mouse_opaque="true" name="group_land_heading" v_pad="0" width="150">
                Group Owned Land
        </text>
@@ -105,7 +105,7 @@
        </text>
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom_delta="-25" drop_shadow_visible="true" follows="left|top"
-             font="SansSerifBig" h_pad="0" halign="left" height="16" left="12"
+             font="SansSerifLarge" h_pad="0" halign="left" height="16" left="12"
             mouse_opaque="true" name="group_money_heading" v_pad="0" width="150">
                Group [CURRENCY]
        </text>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_notices.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_notices.xml
index 0e5e84d..e6d7604 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_notices.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_notices.xml
@@ -15,7 +15,7 @@ the General tab.
        <button bottom="-24" font="SansSerif" halign="center" height="16" label="?"
             label_selected="?" left="391" name="help_button" width="20" />
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-20" drop_shadow_visible="true" font="SansSerifBig" h_pad="0"
+             bottom="-20" drop_shadow_visible="true" font="SansSerifLarge" h_pad="0"
             halign="left" height="16" left="7" mouse_opaque="true" name="lbl" v_pad="0"
             width="436">
                Group Notices Archive
@@ -51,7 +51,7 @@ Notice lists are limited to 200 notices per group on a daily basis.
        <panel border="false" bottom="0" follows="all" height="268" label="Create New Notice"
             left="1" mouse_opaque="true" name="panel_create_new_notice" width="418">
                <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                     bottom="-18" drop_shadow_visible="true" font="SansSerifBig" h_pad="0"
+                     bottom="-18" drop_shadow_visible="true" font="SansSerifLarge" h_pad="0"
                     halign="left" height="16" left="7" mouse_opaque="false" name="lbl"
                     v_pad="0" width="436">
                        Create a Notice
@@ -74,7 +74,8 @@ and you can&apos;t send a folder.
                <line_editor bevel_style="in" border_style="line"
                     border_thickness="1" bottom_delta="0" font="SansSerifSmall" height="16"
                     is_unicode="false" left_delta="58" max_length="63" mouse_opaque="true"
-                     name="create_subject" prevalidate="printable_not_pipe" width="264" />
+                     name="create_subject" prevalidate="printable_not_pipe" width="264" 
+                         spell_check="true" />
                <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                     bottom_delta="-18" drop_shadow_visible="true" font="SansSerifSmall"
                     h_pad="0" halign="right" height="16" left="7" mouse_opaque="true"
@@ -84,7 +85,7 @@ and you can&apos;t send a folder.
                <text_editor bottom_delta="-106" embedded_items="false"
                     font="SansSerifSmall" height="120" hide_scrollbar="true" is_unicode="false"
                     left_delta="58" max_length="511" mouse_opaque="true" name="create_message"
-                     width="346" word_wrap="true" />
+                     width="346" word_wrap="true" spell_check="true" />
                <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                     bottom_delta="-19" drop_shadow_visible="true" font="SansSerifSmall"
                     h_pad="0" halign="right" height="16" left="7" mouse_opaque="true"
@@ -94,7 +95,7 @@ and you can&apos;t send a folder.
                <line_editor bg_visible="false" border_visible="false" bottom_delta="-2" enabled="false"
                     font="SansSerifSmall" height="16" is_unicode="false" left_delta="59"
                     max_length="63" mouse_opaque="false" name="create_inventory_name"
-                     width="211" />
+                     width="211" spell_check="true" />
                <icon bottom_delta="0" height="16" left_delta="0" mouse_opaque="false"
                     name="create_inv_icon" width="16" />
                <button bottom_delta="0" font="SansSerif" halign="center" height="20"
@@ -114,7 +115,7 @@ and you can&apos;t send a folder.
        <panel border="false" bottom="0" follows="all" height="268" label="View Past Notice"
             left="1" mouse_opaque="true" name="panel_view_past_notice" width="418">
                <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                     bottom="-18" drop_shadow_visible="true" font="SansSerifBig" h_pad="0"
+                     bottom="-18" drop_shadow_visible="true" font="SansSerifLarge" h_pad="0"
                     halign="left" height="16" left="7" mouse_opaque="false" name="lbl"
                     v_pad="0" width="436">
                        Archived Notice
@@ -146,7 +147,7 @@ and you can&apos;t send a folder.
                     enabled="false" font="SansSerifSmall" height="206" hide_scrollbar="true"
                     is_unicode="false" left_delta="0" max_length="511" mouse_opaque="true"
                     name="view_message" width="404"
-                     word_wrap="true" />
+                     word_wrap="true" spell_check="true" />
                <button bottom_delta="-24" font="SansSerif" halign="center" height="20"
                     label="Open Attachment" label_selected="Open Attachment" left="7"
                     mouse_opaque="true" name="open_attachment" width="110" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
index bd64622..014b28d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
@@ -12,7 +12,7 @@
             name="help_button" width="20" />
        <panel border="false" bottom="-24" height="24" left="7" name="members_header"
             visible="true" width="380">
-                <text bottom_delta="-20" font="SansSerifBig" halign="left" height="16" left="0"
+                <text bottom_delta="-20" font="SansSerifLarge" halign="left" height="16" left="0"
                     name="static" width="150">
                        Members &amp; Roles
                </text>
@@ -24,7 +24,7 @@ easily be customized, allowing for greater organization and flexibility.
        </panel>
        <panel border="false" bottom_delta="0" height="24" left="7" name="roles_header"
             visible="false" width="380">
-                <text bottom_delta="-20" font="SansSerifBig" halign="left" height="16" left="0"
+                <text bottom_delta="-20" font="SansSerifLarge" halign="left" height="16" left="0"
                     name="static" width="100">
                        Roles
                </text>
@@ -47,7 +47,7 @@ easily be customized, allowing for greater organization and flexibility.
        </panel>
        <panel border="false" bottom_delta="-20" height="24" left="7" name="actions_header"
             visible="false" width="380">
-                <text bottom_delta="0" font="SansSerifBig" halign="left" height="16" left="0"
+                <text bottom_delta="0" font="SansSerifLarge" halign="left" height="16" left="0"
                     name="static" width="200">
                        Abilities
                </text>
@@ -95,7 +95,7 @@ clicking on their names.
                        <line_editor bevel_style="in" border_style="line"
                             border_thickness="1" bottom="143" follows="left|top" font="SansSerifSmall"
                             height="16" is_unicode="false" left="4" max_length="63" mouse_opaque="true"
-                             name="search_text" width="100" />
+                             name="search_text" width="100" spell_check="true" />
                        <button bottom_delta="-2" font="SansSerifSmall" halign="center" height="20"
                             label="Search" left_delta="105" name="search_button" width="60" />
                        <button bottom_delta="0" enabled="false" font="SansSerifSmall" halign="center"
@@ -135,7 +135,7 @@ including the Everyone and Owner Roles.
                        <line_editor bevel_style="in" border_style="line"
                             border_thickness="1" bottom="143" follows="left|top" font="SansSerifSmall"
                             height="16" is_unicode="false" left="6" max_length="63" mouse_opaque="true"
-                             name="search_text" width="100" />
+                             name="search_text" width="100" spell_check="true" />
                        <button bottom_delta="-2" font="SansSerifSmall" halign="center" height="20"
                             label="Search" left_delta="105" name="search_button" width="60" />
                        <button bottom_delta="0" enabled="false" font="SansSerifSmall" halign="center"
@@ -212,7 +212,7 @@ things in this group. There&apos;s a broad variety of Abilities.
                     bottom_delta="-16" drop_shadow_visible="false" follows="left|top"
                     font="SansSerifSmall" height="16" is_unicode="false" left="0"
                     max_length="20" mouse_opaque="true" name="role_title"
-                     width="145">
+                     width="145" spell_check="true">
                        (waiting)
                </line_editor>
                <text_editor bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -220,7 +220,7 @@ things in this group. There&apos;s a broad variety of Abilities.
                     h_pad="0" halign="left" height="48" hide_scrollbar="true" left="150"
                     max_length="254" name="role_description"
                     v_pad="0" width="254"
-                     word_wrap="true">
+                     word_wrap="true" spell_check="true">
                        (waiting)
                </text_editor>
                <text bottom_delta="-26" font="SansSerif" halign="left" height="16" left="0"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_voting.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_voting.xml
index e044f34..64be465 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_voting.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_voting.xml
@@ -20,7 +20,7 @@ vote on open proposals, and view old proposals.
             name="help_button" width="20" />
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="446" drop_shadow_visible="true" follows="left|top"
-             font="SansSerifBig" h_pad="0" halign="left" height="16" left="7"
+             font="SansSerifLarge" h_pad="0" halign="left" height="16" left="7"
             mouse_opaque="false" name="proposal_header" v_pad="0" width="363">
                Open Group Proposals
        </text>
@@ -57,7 +57,7 @@ vote on open proposals, and view old proposals.
             border_visible="false" bottom="300" drop_shadow_visible="false"
             embedded_items="false" follows="left|top" font="SansSerif" height="90"
             is_unicode="false" left="11" max_length="254" mouse_opaque="true"
-             name="proposal_text" width="289" word_wrap="true" />
+             name="proposal_text" width="289" word_wrap="true" spell_check="true" />
        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
             height="20" label="View List" label_selected="View List" left="304"
             mouse_opaque="true" name="btn_view_proposal_list" width="101" />
@@ -144,7 +144,7 @@ vote on open proposals, and view old proposals.
             mouse_opaque="true" name="btn_abstain" width="63" />
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-240" drop_shadow_visible="true" follows="left|top"
-             font="SansSerifBig" h_pad="0" halign="left" height="10" left="12"
+             font="SansSerifLarge" h_pad="0" halign="left" height="10" left="12"
             mouse_opaque="false" name="txt" v_pad="0" width="363">
                Group Voting History
        </text>
@@ -180,7 +180,7 @@ vote on open proposals, and view old proposals.
             hide_scrollbar="true" is_unicode="false" left="10" max_length="1024"
             mouse_opaque="true" name="vote_text"
             text_wrap="true" v_pad="0"
-             width="396" word_wrap="false" />
+             width="396" word_wrap="false" spell_check="true" />
        <button bottom_delta="-25" follows="top" font="SansSerif" halign="center" height="20"
             label="View List" label_selected="View List" left="287" mouse_opaque="true"
             name="btn_view_history_list" width="120" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
index e6b78fb..9303852 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="true" bottom="-371" height="300" left="280" mouse_opaque="true"
-     name="groups" width="350">
+     name="groups" width="350" min_width="350">
        <scroll_list background_visible="true" bottom="45" column_padding="5" draw_border="true"
-             draw_heading="false" draw_stripes="true" enabled="true"
+             draw_heading="true" draw_stripes="true" enabled="true"
             follows="left|top|right|bottom" left="10" mouse_opaque="true"
-             multi_select="false" name="group list" tab_stop="true" top="-10"
+             multi_select="false" name="group list" tab_stop="true" top="-30"
             width="240">
-                <column label="" name="name" width="248" />
+                <column label="Group Name" name="name" dynamicwidth="true" />
+    <column label="Notices" name="receive_notices" width="60" 
+            tool_tip="Receve notices from this group" />
+    <column label="Chat" name="join_group_chat" width="60"
+            tool_tip="Join group IMs (group chat) from this group" />
+    <column label="Public" name="list_in_profile" width="20"
+            image="ff_visible_online_button.tga" 
+            tool_tip="Group is listed in your profile" />
        </scroll_list>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="22" drop_shadow_visible="true" enabled="true" follows="left|bottom"
@@ -21,7 +28,7 @@
                You belong to [COUNT] groups (of [MAX] maximum).
        </text>
        <pad bottom="-7" height="0" left="-90" width="1" />
-        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+        <button bottom_delta="-45" follows="top|right" font="SansSerif" height="22"
             label="IM/Call" left_delta="0" name="IM"
             tool_tip="Open Instant Message session" width="80" />
        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
@@ -38,6 +45,9 @@
             label="Search..." name="Search..." width="80" />
        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
             label="Leave" name="Leave" width="80" />
+  <search_editor bottom="-24" enabled="true" follows="left|right|top" font="SansSerif"
+       height="18" left="10" right="-100" name="group_search"
+       label="Type here to search your groups" width="130" />
  <string name="none">
                none
  </string>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_hud.xml b/linden/indra/newview/skins/default/xui/en-us/panel_hud.xml
new file mode 100644
index 0000000..95f8289
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_hud.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="false" auto_resize="true" background_visible="false" bottom="50"
+     follows="left|right|top|bottom" height="728" left="0" mouse_opaque="false"
+     name="hud" user_resize="false" width="1024" />
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 a60beac..68991b6 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
@@ -1,13 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="panel_login" 
-       bottom="0" left="0" height="600" width="800"
+         bottom="0" left="0" height="600" width="800"
-       follows="left|top|right|bottom" mouse_opaque="true" >
+         follows="left|top|right|bottom" mouse_opaque="true" >
-        <web_browser name="login_html" 
+  <web_browser name="login_html" 
-               bottom="102" top="600" left="0" right="800"
+                         bottom="102" top="-1" left="0" right="-1"
-               border_visible="false" follows="top|left|bottom|right"
+                         border_visible="false" follows="top|left|bottom|right"
-                     start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E" />
+                         start_url="data:text/html,
+                         %3Chtml%3E
+                         %3Chead%3E %3C/head%3E
+                         %3Cbody bgcolor=%22#5a2d65%22 text=%22ffffff%22%3E
+                         %3Ctable width=%22100%%22 height=%22100%%22 border=%220%22%3E
+                           %3Ctr%3E
+                                 %3Ctd align=%22center%22 valign=%22middle%22 style=%22font-size:0.8em;%22%3E
+                                   %3Cimg src=%22imprudence_loading.png%22 align=%22absmiddle%22%3E
+                                   %3Cbr/%3E
+                                   %3CH1%3Eloading...%3C/H1%3E
+                                 %3C/td%3E
+                           %3C/tr%3C
+                         %3C/table%3E
+                         %3C/body%3E
+                         %3C/html%3E" />
        <string name="real_url">
                http://secondlife.com/app/login/
        </string>
@@ -16,32 +30,6 @@
        </string>
-  <!-- START LOCATION -->
-        <text name="start_location_text" 
-              bottom="32" left="10" height="16" right="115"
-        follows="left|bottom" h_pad="0" halign="right" v_pad="0"
-        bg_visible="false" drop_shadow_visible="true"
-        border_visible="false" border_drop_shadow_visible="false"
-              font="SansSerifSmall" mouse_opaque="true">
-                Start location:
-        </text>
-        <combo_box name="start_location_combo"
-             bottom_delta="2" left="120" height="16" width="150"
-             follows="left|bottom" font="SansSerifSmall"
-             mouse_opaque="true" allow_text_entry="true" max_chars="128">
-                <combo_item name="MyHome" value="My Home">
-                        My Home
-                </combo_item>
-                <combo_item name="MyLastLocation" value="My Last Location">
-                        My Last Location
-                </combo_item>
-                <combo_item name="Typeregionname" value="&lt;Type region name&gt;">
-                        &lt;Type region name&gt;
-                </combo_item>
-        </combo_box>
  <!-- FIRST NAME -->
        <text name="first_name_text" 
@@ -58,7 +46,8 @@
               bevel_style="in" border_style="line" border_thickness="1" 
               max_length="31" mouse_opaque="true"
               handle_edit_keys_directly="true"
-               select_all_on_focus_received="true" />
+               select_all_on_focus_received="true"
+               allow_translate="false" />
  <!-- LAST NAME -->
@@ -77,13 +66,34 @@
               bevel_style="in" border_style="line" border_thickness="1" 
               max_length="31" mouse_opaque="true"
               handle_edit_keys_directly="true"
-               select_all_on_focus_received="true" />
+               select_all_on_focus_received="true"
+               allow_translate="false" />
+  <!-- SL USERNAME -->
+  <text name="username_text"
+              bottom="80" left="24" height="16" width="250"
+        follows="left|bottom" h_pad="0" halign="left" v_pad="0"
+        bg_visible="false" drop_shadow_visible="true"
+        border_visible="false" border_drop_shadow_visible="false"
+              font="SansSerif" mouse_opaque="true">
+    Login name:
+  </text>
+  <line_editor name="username_edit"
+               bottom_delta="-20" left_delta="0" height="20" width="250"
+               follows="left|bottom" font="SansSerif"
+               bevel_style="in" border_style="line" border_thickness="1"
+               max_length="31" mouse_opaque="true"
+               handle_edit_keys_directly="true"
+               select_all_on_focus_received="true"
+               allow_translate="false" />
  <!-- PASSWORD -->
        <text name="password_text" 
-              bottom_delta="20" left_delta="130" height="16" width="120"
+              bottom_delta="20" left="285" height="16" width="120"
        follows="left|bottom" h_pad="0" halign="left" v_pad="0"
        bg_visible="false" drop_shadow_visible="true"
        border_visible="false" border_drop_shadow_visible="false"
@@ -96,37 +106,72 @@
               bevel_style="in" border_style="line" border_thickness="1" 
               max_length="16" mouse_opaque="true"
                     handle_edit_keys_directly="true"
-               select_all_on_focus_received="true" />
+               select_all_on_focus_received="true"
-        <check_box name="remember_check" label="Remember password"
+               allow_translate="false" />
-             bottom_delta="-24" left_delta="0" height="16" width="140"
-             follows="left|bottom" font="SansSerifSmall" control_name="RememberPassword" 
-                   initial_value="false" mouse_opaque="true"  />
  <!-- GRIDS -->
-        <text name="grid_text" 
+  <text name="grid_text"
              bottom="80" left_delta="150" height="16" width="120"
        follows="left|bottom" h_pad="0" halign="left" v_pad="0"
        bg_visible="false" drop_shadow_visible="true"
        border_visible="false" border_drop_shadow_visible="false"
              font="SansSerif" mouse_opaque="true">
-                Grid:
+    Grid:
-        </text>
+  </text>
-        <combo_box name="server_combo"
+  <combo_box name="server_combo"
             bottom_delta="-20" left_delta="0" height="20" width="120"
             follows="left|bottom" allow_text_entry="false"
             max_chars="20" mouse_opaque="true" />
-        <button name="grid_btn" label="Grid Manager"
-          bottom_delta="-24" left_delta="10" height="16" width="100"
-          follows="left|bottom" font="SansSerifSmall" halign="center"
+  <!-- START LOCATION -->
-                      mouse_opaque="true" scale_image="TRUE" />
+  <text name="start_location_text"
+              bottom="32" left="10" height="16" right="115"
+        follows="left|bottom" h_pad="0" halign="right" v_pad="0"
+        bg_visible="false" drop_shadow_visible="true"
+        border_visible="false" border_drop_shadow_visible="false"
+              font="SansSerifSmall" mouse_opaque="true">
+    Start location:
+  </text>
+  <combo_box name="start_location_combo"
+             bottom_delta="2" left="120" height="16" width="150"
+             follows="left|bottom" font="SansSerifSmall"
+             mouse_opaque="true" allow_text_entry="true" max_chars="128">
+    <combo_item name="MyHome" value="My Home">
+      My Home
+    </combo_item>
+    <combo_item name="MyLastLocation" value="My Last Location">
+      My Last Location
+    </combo_item>
+    <combo_item name="Typeregionname" value="&lt;Type region name&gt;">
+      &lt;Type region name&gt;
+    </combo_item>
+  </combo_box>
+  <!-- REMEMBER PASSWORD -->
+  <check_box name="remember_check" label="Remember password"
+           bottom_delta="-2" left="282" height="16" width="140"
+           follows="left|bottom" font="SansSerifSmall" control_name="RememberPassword"
+           initial_value="false" mouse_opaque="true"  />
+  <!-- GRID MANAGER -->
+  
+  <button name="grid_btn" label="Grid Manager"
+        bottom_delta="0" left="434" height="20" width="100"
+        follows="left|bottom" font="SansSerifSmall" halign="center"
+        mouse_opaque="true" scale_image="TRUE" />
  <!-- LOG IN -->
        <button name="connect_btn" label="Log In"
-          bottom="58" left_delta="140" height="24" width="120"
+          bottom="58" left_delta="150" height="24" width="120"
          follows="left|bottom" font="SansSerif" halign="center"
                mouse_opaque="true" scale_image="TRUE" />
@@ -168,7 +213,7 @@
  <web_browser name="news_bar"
-               bottom="0" top="20" left="0" right="800"
+               bottom="0" top="20" left="0" right="-1"
               border_visible="true" follows="left|bottom|right"
               start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000%22%3E%3C/body%3E%3C/html%3E" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_media_hud.xml b/linden/indra/newview/skins/default/xui/en-us/panel_media_hud.xml
new file mode 100644
index 0000000..1c0781a
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_media_hud.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="false" follows="" height="160" visible="false" mouse_opaque="false"  
+     label="" name="MediaHUD" width="208" background_visible="false" background_opaque="false" bg_alpha_color="1 1 1 0.0">
+<panel name="media_region" left="20" right="-20" bottom="35" top="-20" follows="left|right|top|bottom" visible="true" background_opaque="false"
+       mouse_opaque="false"/>
+        <!--icon name="bg_image" image_name="media_panel_hoverrectangle.png" visible="true" left="10" bottom="32" right="-10" top="-10" follows="left|right|top|bottom"/-->
+        <layout_stack orientation="horizontal" left="0" bottom="0" follows="left|right|bottom" visible="true" width="208" height="32">
+                <layout_panel user_resize="false"/>
+                <layout_panel user_resize="false" auto_resize="false" width="210" min_width="208">
+                        <panel name="media_focused_controls" width="208" left="0" height="32" bottom="0" visible="true">
+                                <icon name="media_panel_transportcontrols_bg" image_name="media_panel_bg.png" visible="true" height="32" width="99" scale_image="true" bottom="0"/>
+                                <button name="back" label="" left="4" width="20" bottom="6" height="22" image_unselected="media_btn_back.png" 
+                                        image_selected="media_btn_back.png" scale_image="true"/>
+                                <icon name="media_panel_divider-1" image_name="media_panel_divider.png" visible="true" height="22" width="3" left_delta="20" 
+                                        scale_image="false" bottom="5"/>
+                                <button name="fwd" label="" left_delta="3"  width="17" bottom_delta="0" height="22" image_unselected="media_btn_forward.png" 
+                                        image_selected="media_btn_forward.png" scale_image="true"/>
+                                <icon name="media_panel_divider-2" image_name="media_panel_divider.png" visible="true" height="22" width="3" left_delta="17" 
+                                        scale_image="false" bottom="5"/>
+                                <button name="home" label="" left_delta="3"  width="22" bottom_delta="0" height="22" image_unselected="media_btn_home.png" 
+                                        image_selected="media_btn_home.png" scale_image="true"/>
+        <button name="media_stop" label="" left_delta="0"  width="22" bottom_delta="0" height="22" image_unselected="button_anim_stop.tga"
+                                        image_selected="button_anim_stop.tga" scale_image="true"/>
+        <icon name="media_panel_divider-3" image_name="media_panel_divider.png" visible="true" height="22" width="3" left_delta="22" 
+                                        scale_image="false" bottom="5"/>
+                                <button name="reload" label="" left_delta="3"  width="22" bottom_delta="0" height="22" image_unselected="media_btn_reload.png" 
+                                        image_selected="media_btn_reload.png" scale_image="true"/>
+                                <button name="stop" label="" left_delta="0"  width="22" bottom_delta="0" height="22" image_unselected="media_btn_stoploading.png" 
+                                        image_selected="media_btn_stoploading.png" scale_image="true" visible="false"/>
+        <button name="play" label="" left_delta="0"  width="22" bottom_delta="0" height="22" image_unselected="button_anim_play.tga"
+                                        image_selected="button_anim_play.tga" scale_image="true" visible="false"/>
+        <button name="pause" label="" left_delta="0"  width="22" bottom_delta="0" height="22" image_unselected="button_anim_pause.tga"
+                                        image_selected="button_anim_pause.tga" scale_image="true" visible="false"/>
+        <icon name="media_panel_scrollbg" image_name="media_panel_scrollbg.png" visible="true" height="32" width="32" 
+                                        scale_image="false" bottom="0" left="97"/>
+                                <button name="scrollup" label="" left="109" width="8" bottom="20" height="8" image_unselected="media_btn_scrollup.png" 
+                                        image_selected="media_btn_scrollup.png" scale_image="false"/>
+                                <button name="scrollleft" label="" left="100" width="8" bottom="12" height="8" image_unselected="media_btn_scrollleft.png" 
+                                        image_selected="media_btn_scrollleft.png" scale_image="false"/>
+                                <button name="scrollright" label="" left="117" width="8" bottom="12" height="8" image_unselected="media_btn_scrollright.png" 
+                                        image_selected="media_btn_scrollright.png" scale_image="false"/>
+                                <button name="scrolldown" label="" left="109" width="8" bottom="4" height="8" image_unselected="media_btn_scrolldown.png" 
+                                        image_selected="media_btn_scrolldown.png" scale_image="false"/>
+                                <icon name="media_panel_metacontrols_bg" image_name="media_panel_bg.png" visible="true" height="32" width="81" 
+                                        scale_image="true" bottom="0" left="127"/>
+                                <button name="zoom_frame" label="" left_delta="4" width="22" bottom="5" height="22" image_unselected="media_btn_optimalzoom.png" 
+                                        image_selected="media_btn_optimalzoom.png" scale_image="true"/>
+                                <icon name="media_panel_divider-4" image_name="media_panel_divider.png" visible="true" height="22" width="3" left_delta="22" 
+                                        scale_image="false" bottom="5"/>
+                                <button name="new_window" label="" left_delta="3" width="24" bottom_delta="1" height="22" image_unselected="media_btn_newwindow.png" 
+                                        image_selected="media_btn_newwindow.png" scale_image="true"/>
+                                <icon name="media_panel_divider-5" image_name="media_panel_divider.png" visible="true" height="22" width="3" left_delta="24" 
+                                        scale_image="false" bottom="5"/>
+                                <button name="close" label="" left_delta="3" width="21" bottom_delta="1" height="22" image_unselected="media_btn_done.png" 
+                                        image_selected="media_btn_done.png" scale_image="true"/>
+                        </panel>
+                        <panel name="media_hover_controls" width="57" left="74" height="32" bottom="0" visible="false">
+                                <icon name="media_panel_metacontrols_bg-hover" image_name="media_panel_bg.png" visible="true" height="32" width="57" scale_image="true" bottom="0" left="0"/>
+                                <button name="zoom_frame_hover" label="" left_delta="4" width="22" bottom="5" height="22" image_unselected="media_btn_optimalzoom.png" image_selected="media_btn_optimalzoom.png" 
+                                        scale_image="true"/>
+                                <icon name="media_panel_divider" image_name="media_panel_divider.png" visible="true" height="22" width="3" left_delta="22" scale_image="false" bottom="5"/>
+                                <button name="new_window_hover" label="" left_delta="3" width="24" bottom_delta="1" height="22" image_unselected="media_btn_newwindow.png" image_selected="media_btn_newwindow.png" 
+                                        scale_image="true"/>
+                        </panel>
+    </layout_panel>
+                <layout_panel user_resize="false"/>
+        </layout_stack> 
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_particle_settings.xml b/linden/indra/newview/skins/default/xui/en-us/panel_particle_settings.xml
new file mode 100644
index 0000000..c1e1da9
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_particle_settings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Particle Settings"
+left="1" mouse_opaque="true" name="ParticleSettings" width="418">
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                bottom_delta="-36" drop_shadow_visible="true" enabled="true" follows="left|top"
+                font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+                mouse_opaque="true" name="part_start_color_textbox" v_pad="0" width="394">
+                Start Color:
+        </text>
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-44"
+                can_apply_immediately="true" color="1 1 1 1"
+                enabled="true" follows="left|top" height="55" label="" left_delta="53"
+                mouse_opaque="true" name="part_start_color_swatch"
+                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_delta="-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="part_end_color_textbox" v_pad="0" width="394">
+                End Color:
+        </text>
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-44"
+                can_apply_immediately="true" color="1 1 1 1"
+                enabled="true" follows="left|top" height="55" label="" left_delta="53"
+                mouse_opaque="true" name="part_end_color_swatch"
+                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_delta="-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="part_texture_textbox" v_pad="0" width="394">
+                Texture:
+        </text>
+        <texture_picker  border_color="0.45098 0.517647 0.607843 1" bottom_delta="-44"
+                can_apply_immediately="true" color="1 1 1 1"
+                enabled="true" follows="left|top" height="55" label="" left_delta="53"
+                mouse_opaque="true" name="part_texture_picker"
+                tool_tip="Click to open Texture Chooser" width="45" />
+        <button name="reset_cloud_this_account" label="reset for this account" halign="center"
+                tool_tip="reset the Avatar particle cloud to default for this account" left="12"
+                bottom_delta="-50" width="180" height="20" font="SansSerifSmall" follows="left|top"/>
+        <button name="save_cloud_this_account" label="save for this account" halign="center"
+                tool_tip="save the Avatar particle cloud for this account" left="12"
+                bottom_delta="-50" width="180" height="20" font="SansSerifSmall" follows="left|top"/>
+        <button name="save_cloud_any_account" label="save for any account" halign="center"
+                tool_tip="save the Avatar particle cloud for any account" left="12"
+                bottom_delta="-24" width="180" height="20" font="SansSerifSmall" follows="left|top"/>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_place.xml b/linden/indra/newview/skins/default/xui/en-us/panel_place.xml
index d50aa53..96d9dd5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_place.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_place.xml
@@ -14,7 +14,7 @@
        </text>
        <text_editor bottom_delta="-68" enabled="false" follows="left|top"
             font="SansSerif" height="70" left="20" max_length="1023" name="desc_editor"
-             width="400" word_wrap="true" />
+             width="400" word_wrap="true" spell_check="true" />
        <text bottom_delta="-25" follows="left|top" font="SansSerif" height="20" left="20" name="information_label">
                Information:
        </text>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_place_small.xml b/linden/indra/newview/skins/default/xui/en-us/panel_place_small.xml
index 94024f9..64ab9f3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_place_small.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_place_small.xml
@@ -14,7 +14,7 @@
        </text>
        <text_editor bg_readonly_color="clear" bottom_delta="-68" enabled="false" follows="left|top"
             font="SansSerif" height="70" left="20" max_length="1023" name="desc_editor"
-             width="360" word_wrap="true" />
+             width="360" word_wrap="true" spell_check="true" />
        <text bottom_delta="-20" follows="left|top" font="SansSerif" height="20" left="20" name="information_label">
                Information:
        </text>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index dfd8c65..3b66fb8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -2,102 +2,120 @@
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
     height="408" label="Advanced" left="102" mouse_opaque="true"
     name="advanced_panel" width="517">
-  
  <!-- Start organizing these when we get enough of 'em - MC -->
-  
+  <tab_container label="Page 2" bottom="0" height="450" left="0" mouse_opaque="false"
-  <check_box bottom="-30" enabled="true"
+   name="tab2" tab_min_width="50" tab_position="top" width="495" bg_opaque_color="0,0,0,0.0">
-       follows="left|top" font="SansSerifSmall" height="16"
+    
-       initial_value="false" label="Disable login/logout screens" left="12"
+    <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-       mouse_opaque="true" name="disable_log_screen_check" radio_style="false"
+     height="408" label="Main" left="102" mouse_opaque="true"
-       width="217" />
+     name="main_panel" width="517">
-  <check_box bottom_delta="-18" enabled="true" follows="left|top"
+      <check_box bottom="-30" enabled="true"
-             font="SansSerifSmall" height="16" initial_value="false"
+           follows="left|top" font="SansSerifSmall" height="16"
-             label="Disable teleport screen" left="12" mouse_opaque="true"
+           initial_value="false" label="Disable login/logout screens" left="12"
-             name="disable_tp_screen_check" radio_style="false" width="217" />
+           mouse_opaque="true" name="disable_log_screen_check" radio_style="false"
-  <check_box bottom_delta="-25" enabled="true" follows="left|top"
+           width="217" />
-       font="SansSerifSmall" height="16" initial_value="false"
+      <check_box bottom_delta="-18" enabled="true" follows="left|top"
-       label="Show client names in nametags" left="12" mouse_opaque="true"
+                 font="SansSerifSmall" height="16" initial_value="false"
-       name="client_name_tag_check" radio_style="false" width="160" />
+                 label="Disable teleport screen" left="12" mouse_opaque="true"
-  <check_box bottom_delta="-18" enabled="true" follows="left|top"
+                 name="disable_tp_screen_check" radio_style="false" width="217" />
-       font="SansSerifSmall" height="16" initial_value="false"
+      <check_box bottom_delta="-25" enabled="true" follows="left|top"
-       label="Show client names with color" left_delta="0" mouse_opaque="true"
+          font="SansSerifSmall" height="16" initial_value="false"
-       name="client_name_color_check" radio_style="false" width="160" />
+          label="Show client names in nametags" left="12" mouse_opaque="true"
-  <check_box bottom_delta="-18" enabled="true" follows="left|top"
+          name="client_name_tag_check" radio_style="false" width="160" />
-       font="SansSerifSmall" height="16" initial_value="false"
+      <check_box bottom_delta="-18" enabled="true" follows="left|top"
-       label="Show client names in hovertip" left_delta="0" mouse_opaque="true"
+           font="SansSerifSmall" height="16" initial_value="false"
-       name="client_name_hover_check" radio_style="false" width="160" />
+           label="Show client names in hovertip" left_delta="0" mouse_opaque="true"
-  <check_box bottom_delta="-18" enabled="true" follows="left|top"
+           name="client_name_hover_check" radio_style="false" width="160" />
-       font="SansSerifSmall" height="16" initial_value="false"
+      <check_box bottom_delta="-18" enabled="true" follows="left|top"
-       label="Show your client name to others" left_delta="0" mouse_opaque="true"
+           font="SansSerifSmall" height="16" initial_value="false"
-       name="client_name_tag_broadcast_check" radio_style="false" width="217" />
+           label="Show your client name to others" left_delta="0" mouse_opaque="true"
-  <check_box bottom_delta="-25" enabled="true" follows="left|top"
+           name="client_name_tag_broadcast_check" radio_style="false" width="217" />
-       font="SansSerifSmall" height="16" initial_value="false"
+      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-122"
-       label="Enable shadows (WARNING: unstable and requires Ultra graphics)" left="12" mouse_opaque="true"
+           can_apply_immediately="true" color="0.79 0.44 0.88 1"
-       name="shadows_check" radio_style="false" width="217" />
+           enabled="true" follows="left|top"
+           height="65" label="Imprudence" left="250" mouse_opaque="true"
-  <text bottom_delta="-25" left="16" height="15" width="300"
+           name="client_tag_color" width="65" />
-        follows="top|left">
+      <check_box bottom_delta="-18" enabled="true" follows="left|top"
-    Allow region WindLight settings (LightShare):
+           font="SansSerifSmall" height="16" initial_value="false"
-  </text>
+           label="Show client names with color" left_delta="0" mouse_opaque="true"
-  <combo_box name="lightshare_combo"
+           name="client_name_color_check" radio_style="false" width="160" />
-             bottom_delta="-2" left_delta="250" height="18" width="135"
+      <check_box bottom_delta="-25" enabled="true" follows="left|top"
-             allow_text_entry="false" follows="left|top">
+           font="SansSerifSmall" height="16" initial_value="false"
-    <combo_item type="string" name="never" value="0">
+           label="Enable shadows (WARNING: unstable and requires Ultra graphics)" left="12" mouse_opaque="true"
-      Never
+           name="shadows_check" radio_style="false" width="217" />
-    </combo_item>
+      <text bottom_delta="-25" left="16" height="15" width="300"
-    <combo_item type="string" name="ask" value="1">
+           follows="top|left">
-      Ask me every time
+          Allow region WindLight settings (LightShare):
-    </combo_item>
+      </text>
-    <combo_item type="string" name="always" value="2">
+      <combo_box name="lightshare_combo"
-      Always
+                 bottom_delta="-2" left_delta="250" height="18" width="135"
-    </combo_item>
+                 allow_text_entry="false" follows="left|top">
-  </combo_box>
+        <combo_item type="string" name="never" value="0">
+          Never
-  <check_box bottom_delta="-25" enabled="true" follows="left|top"
+        </combo_item>
-       font="SansSerifSmall" height="16" initial_value="false"
+        <combo_item type="string" name="ask" value="1">
-       label="Use HTTP texture fetching (experimental)" left="12" mouse_opaque="true"
+          Ask me every time
-       name="http_texture_check" radio_style="false" width="217" />
+        </combo_item>
-  <check_box bottom_delta="-18" enabled="true" follows="left|top"
+        <combo_item type="string" name="always" value="2">
-       font="SansSerifSmall" height="16" initial_value="false"
+          Always
-       label="Increase rez speed via draw distance stepping" left="12" mouse_opaque="true"
+        </combo_item>
-       name="speed_rez_check" radio_style="false" width="217" />
+      </combo_box>
-  <spinner bottom_delta="-18" decimal_digits="0"
+      <check_box bottom_delta="-25" enabled="true" follows="left|top"
-       tool_tip="Interval in seconds between each draw distance increment"
+           font="SansSerifSmall" height="16" initial_value="false"
-       follows="left|top" height="16" increment="1" initial_val="12"
+           label="Use HTTP texture fetching (experimental)" left="12" mouse_opaque="true"
-       label="Step interval every:" label_width="105" left_delta="20" max_val="20"
+           name="http_texture_check" radio_style="false" width="217" />
-       min_val="1" mouse_opaque="true" name="speed_rez_interval_spinner" width="145" />
+      <check_box bottom_delta="-18" enabled="true" follows="left|top"
-  <text bottom_delta="0" follows="top|left" height="15" left_delta="150"
+           font="SansSerifSmall" height="16" initial_value="false"
-             name="speed_rez_seconds_text" width="115">
+           label="Increase rez speed via draw distance stepping" left="12" mouse_opaque="true"
-    seconds
+           name="speed_rez_check" radio_style="false" width="217" />
-  </text>
+      <spinner bottom_delta="-18" decimal_digits="0"
-  <check_box bottom_delta="-25" enabled="true" follows="left|top"
+           tool_tip="Interval in seconds between each draw distance increment"
-       font="SansSerifSmall" height="16" initial_value="false"
+           follows="left|top" height="16" increment="1" initial_val="12"
-       tool_tip="Toggle editing animation and standing up when entering appearance mode" 
+           label="Step interval every:" label_width="105" left_delta="20" max_val="20"
-       label="Animate avatar when editing appearance" left="12" mouse_opaque="true"
+           min_val="1" mouse_opaque="true" name="speed_rez_interval_spinner" width="145" />
-       name="appearance_anim_check" radio_style="false" width="217" />
+      <text bottom_delta="0" follows="top|left" height="15" left_delta="150"
-  <check_box bottom_delta="-25" enabled="true"
+                 name="speed_rez_seconds_text" width="115">
-       follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        seconds
-       label="Use legacy pie menus" left="12"
+      </text>
-       mouse_opaque="true" name="legacy_pie_menu_checkbox" radio_style="false"
+      <check_box bottom_delta="-25" enabled="true" follows="left|top"
-       width="256" />
+           font="SansSerifSmall" height="16" initial_value="false"
-  <check_box bottom_delta="-25" enabled="true"
+           tool_tip="Toggle editing animation and standing up when entering appearance mode" 
-       follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+           label="Animate avatar when editing appearance" left="12" mouse_opaque="true"
-       initial_value="false" label="Share language with objects" left="12"
+           name="appearance_anim_check" radio_style="false" width="217" />
-       mouse_opaque="true" name="language_is_public"
+      <check_box bottom_delta="-25" control_name="HeadFollowsMouse" enabled="true"
-       radio_style="false" tool_tip="This lets in-world objects know your preferred language."
+           follows="left|top" font="SansSerifSmall" height="16" 
-       width="256" />
+           label="Head follows mouse" tooltip="If your avatars head follows your mouse movements" left="12"
-  <check_box bottom_delta="-25" enabled="true"
+           mouse_opaque="true" name="head_follows_mouse_checkbox" radio_style="false"
-       follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+           width="256" />
-       initial_value="false" label="Use MU* pose style chat and IM" left="12"
+      <check_box bottom_delta="-25" enabled="true"
-       mouse_opaque="true" name="allow_mupose"
+           follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-       radio_style="false" tool_tip="Use MU* pose style in chat and IM (with ':' as a synonymous to '/me ')."
+           label="Use legacy pie menus" left="12"
-       width="256" />
+           mouse_opaque="true" name="legacy_pie_menu_checkbox" radio_style="false"
-  <check_box bottom_delta="0" enabled="true"
+           width="256" />
-       follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+      <check_box bottom_delta="-25" enabled="true"
-       initial_value="false" label="Auto-close OOC (( )) chat" left_delta="250"
+           follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-       mouse_opaque="true" name="auto_close_ooc"
+           initial_value="false" label="Share language with objects" left="12"
-       radio_style="false" tool_tip="Auto-close OOC chat (i.e. add )) if not found and (( was used)."
+           mouse_opaque="true" name="language_is_public"
-       width="256" />
+           radio_style="false" tool_tip="This lets in-world objects know your preferred language."
+           width="256" />
+      <check_box bottom_delta="-25" enabled="true"
+           follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+           initial_value="false" label="Use MU* pose style chat and IM" left="12"
+           mouse_opaque="true" name="allow_mupose"
+           radio_style="false" tool_tip="Use MU* pose style in chat and IM (with ':' as a synonymous to '/me ')."
+           width="256" />
+      <check_box bottom_delta="0" enabled="true"
+           follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+           initial_value="false" label="Auto-close OOC (( )) chat" left_delta="250"
+           mouse_opaque="true" name="auto_close_ooc"
+           radio_style="false" tool_tip="Auto-close OOC chat (i.e. add )) if not found and (( was used)."
+           width="256" />
+      <check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+           initial_value="false" label="Use the chatbar as a command line" left="12"
+           mouse_opaque="true" name="command_line_check" radio_style="false" width="270"/>
+      <button bottom_delta="-20" follows="left|top" font="SansSerif" height="20" width="150"
+           label="Chatbar Commands" name="command_line_btn" left="12"
+           tool_tip="Set specific chatbar command line commands here" />
  <!-- Uncomment when we start using the crash logger - MC -->
  <!--<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -120,8 +138,68 @@
    </combo_item>
  </combo_box>-->
-  <button bottom="5" follows="left|top" font="SansSerifSmall" height="20" width="250" 
+    </panel>
-       label="Reset All Preferences To Default" name="reset_btn" left="12" 
+    
-       tool_tip="Reset all preferences to their default values (requires a restart)" />
+    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="SpellCheck"
+       left="1" mouse_opaque="true" name="SpellCheck" width="418">
+      <button bottom="-25" follows="left|top" font="SansSerifSmall" height="18" label="?"
+         name="EmeraldHelp_SpellCheck" tool_tip="Click here for help regarding the settings in this page."
+         right="490" width="18"/>
+      <check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+         label="Show misspelled words in red" left="12" mouse_opaque="true" name="EmeraldSpellDisplay"
+         control_name="EmeraldSpellDisplay" width="126"/>
+      <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left="12"
+         name="EmSpell_txt1" width="512">
+        Current language (dictionary):
+      </text>
+      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="18"
+         max_chars="200" mouse_opaque="true" name="EmeraldSpellBase" width="250"
+         control_name="EmeraldSpellBase" tool_tip=""/>
+      <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left="12"
+         name="EmSpell_txt3" width="512">
+        Downloaded languages (dictionaries):
+      </text>
+      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="18"
+         max_chars="200" mouse_opaque="true" name="EmSpell_Avail" width="250"
+         control_name="EmSpell_Avail" tool_tip=""/>
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Install"
+         name="EmSpell_Add" tool_tip="" left_delta="255" width="80"/>
+      <button bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20" label="Download More..."
+         name="EmSpell_GetMore" tool_tip="Get more dictionaries availabe online" left="12" width="250"/>
+      <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left="12"
+         name="EmSpell_txt2" width="512">
+        Additional custom languages (dictionaries):
+      </text>
+      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="18"
+         max_chars="200" mouse_opaque="true" name="EmSpell_Installed" width="250"
+         control_name="EmSpell_Installed" tool_tip=""/>
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Remove"
+         name="EmSpell_Remove" tool_tip="" left_delta="255" width="80"/>
+      <!--<button bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="18" label="Edit Custom dictionary"
+         name="EmSpell_EditCustom" tool_tip="" left_delta="20" width="130"/>-->
+      <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left="12"
+         name="EmSpell_txt4" width="512">
+To use spellcheck, right-click a misspelled word
+(red or otherwise) and select its replacement
+      </text>
+      <button name="ac_button" label="AutoCorrect Options..." halign="center"
+         tool_tip="Modify the AutoCorrect word list and settings" left="12"
+         bottom_delta="-50" width="180" height="20" font="SansSerifSmall" follows="left|top"/>
+    </panel>
+    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Eye Candy"
+       left="1" mouse_opaque="true"  filename="panel_particle_settings.xml" name="AvatarCloud" width="418">
+        <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="10"
+                mouse_opaque="true" name="must_be_logged_in_textbox" v_pad="0" width="394">
+                You must be logged in to change this
+        </text>
+        <check_box bottom_delta="-4" control_name="PreviewAvatarAsCloud" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16"
+             label="Preview avatar as cloud" left="10"
+             mouse_opaque="true" name="preview_cloud"
+             radio_style="false" tool_tip="Preview avatar as cloud when already rezzed"
+             width="80" />
+    </panel>
+  </tab_container>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
index c6bb938..355d7e8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
@@ -9,13 +9,13 @@
                Volume:
        </text>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-190" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-202" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
             mouse_opaque="true" name="streaming_prefs_text" v_pad="0" width="128">
                Streaming:
        </text>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-285" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-315" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
             mouse_opaque="true" name="audio_prefs_text" v_pad="0" width="128">
                Audio:
@@ -42,7 +42,21 @@
             initial_value="true" label="Automatically play media" left="162"
             mouse_opaque="true" name="auto_streaming_video" radio_style="false"
             width="338" />
-        <check_box bottom_delta="-27" control_name="MuteWhenMinimized" enabled="true"
+        <check_box bottom_delta="-20" control_name="MediaOnAPrimUI" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="true" label="Media helper widget" left="162"
+             mouse_opaque="true" name="media_helper_widget" radio_style="false"
+             width="338" />     
+        <check_box bottom_delta="-20" control_name="MediaEnableFilter" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="true" label="Filter media URLs" left="142"
+             mouse_opaque="true" name="enable_media_filter" radio_style="false"
+             width="200" />
+        <button name="show_media_filter" font="SansSerif" label="Media Filter Settings" halign="center"
+             tool_tip="Edit settings and the blocked and allowed lists for the Media Filter."
+             enabled="false" mouse_opaque="true" follows="top|right"
+             bottom_delta="-2" right="-15" height="20" width="180" />
+        <check_box bottom_delta="-33" control_name="MuteWhenMinimized" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
             label="Mute audio when window minimized" left="142" mouse_opaque="true"
             name="mute_when_minimized" radio_style="false" width="215" />
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 61c6b23..9ead3bf 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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-    height="408" label="Text Chat" left="102" mouse_opaque="true" name="chat"
+    height="408" label="Chat" left="102" mouse_opaque="true" name="chat"
    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"
@@ -24,60 +24,84 @@
                        Large
                </radio_item>
        </radio_group>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom_delta="-40" 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_translate_chat" v_pad="0" width="128">
+    Translate Chat:
+  </text>
+  <check_box bottom_delta="-3" control_name="TranslateChat" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Use machine translation while chatting (powered by Google)" left="148" mouse_opaque="true"
+             name="translate_chat" radio_style="false" width="237" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-16" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="149"
+             mouse_opaque="false" name="text_translate_chat" v_pad="0" width="160">
+    Translate into this language:
+  </text>
+  <combo_box allow_text_entry="true" bottom_delta="-5" enabled="true"
+             follows="left|top" height="16" left_delta="183" max_chars="135"
+             mouse_opaque="true" name="translate_language_combobox" width="146">
+    <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
+      System Default
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="English" value="en">
+      English
+    </combo_item>
+    <!-- After "System Default" and "English", please keep the rest of these combo_items in alphabetical order by the first character in the string. -->
+    <combo_item type="string" length="1" enabled="true" name="Danish" value="da">
+      Dansk (Danish)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Deutsch(German)" value="de">
+      Deutsch (German)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
+      Español (Spanish)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="French" value="fr">
+      Français (French)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Italian" value="it">
+      Italiano (Italian)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Hungarian" value="hu">
+      Magyar (Hungarian)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Dutch" value="nl">
+      Nederlands (Dutch)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Polish" value="pl">
+      Polski (Polish)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Portugese" value="pt">
+      Portugués (Portuguese)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Russian" value="ru">
+      Русский (Russian)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Turkish" value="tr">
+      Türkçe (Turkish)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Ukrainian" value="uk">
+      Українська (Ukrainian)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
+      中文 (简体) (Chinese)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
+      日本語 (Japanese)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
+      한국어 (Korean)
+    </combo_item>
+  </combo_box>
+  
        <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"
+             bottom_delta="-40" 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">
-                Color:
-        </text>
-        <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="54" />
-        <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="Others" left_delta="68"
-             mouse_opaque="true" name="agent" width="54" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
-             can_apply_immediately="true" color="0.6 0.6 1 1"
-             enabled="true" follows="left|top" height="56" label="IMs" left_delta="68"
-             mouse_opaque="true" name="im" width="54" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
-             can_apply_immediately="true" color="0.8 1 1 1"
-             enabled="true" follows="left|top"
-             height="56" label="System" left_delta="68" mouse_opaque="true"
-             name="system" width="54" />
-        <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="68" mouse_opaque="true"
-             name="script_error" width="54" />
-        <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="148" mouse_opaque="true"
-             name="objects" width="54" />
-        <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="ObjectIMColor" enabled="true" follows="left|top"
-             height="56" label="Object IMs" left_delta="68" mouse_opaque="true"
-       name="object_ims" width="54" />
-  <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"
-             enabled="true" follows="left|top"
-             height="56" label="Owner" left_delta="68" mouse_opaque="true" name="owner"
-             width="54" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
-             can_apply_immediately="true" color="0 0 0 1"
-             enabled="true" follows="left|top"
-             height="56" label="Bubble" left_delta="68" mouse_opaque="true"
-             name="background" width="54" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
-             can_apply_immediately="true" color="0.6 0.6 1 1"
-             enabled="true" follows="left|top" height="56"
-             label="URLs" left_delta="68" mouse_opaque="true" name="links" width="54" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-25" 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:
@@ -115,8 +139,29 @@
             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_delta="-40" 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">
+    Chat Bubbles:
+  </text>
+  <check_box bottom_delta="-8" 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" />
+  <check_box bottom_delta="-0" control_name="UseLocalChatBubbles" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Show local chat and bubbles" left="288" mouse_opaque="true"
+             name="local_bubble_text_chat" radio_style="false" width="237" />
+  <slider bottom_delta="-20" can_edit_text="false" control_name="ChatBubbleOpacity"
+             decimal_digits="3" enabled="true" follows="left|top" height="12"
+             increment="0.05" initial_val="1" label="Bubble opacity:" left="148" max_val="1"
+             min_val="0" mouse_opaque="true" name="bubble_chat_opacity" show_text="true"
+             value="0.5" width="225" />
+  
        <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"
+              bottom_delta="-40" 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">
    Miscellaneous:
@@ -147,19 +192,5 @@
             font="SansSerifSmall" height="16" initial_value="false" 
             label="Show custom chat channel" left="148" mouse_opaque="true"
             name="toggle_channel_control" radio_style="false" width="237" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-379" 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">
-                Chat Bubbles:
-        </text>
-        <check_box bottom="-386" 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="-402" can_edit_text="false" control_name="ChatBubbleOpacity"
-             decimal_digits="3" enabled="true" follows="left|top" height="12"
-             increment="0.05" initial_val="1" label="Bubble opacity:" left="148" max_val="1"
-             min_val="0" mouse_opaque="true" name="bubble_chat_opacity" show_text="true"
-             value="0.5" width="225" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml
new file mode 100644
index 0000000..40a75a6
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
+    height="408" label="Chat Colors" left="102" mouse_opaque="true" name="colors"
+    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="12"
+             mouse_opaque="false" name="text_box2" v_pad="0" width="128">
+    Chat Colors:
+  </text>
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-75"
+             can_apply_immediately="true" color="1 1 1 1" control_name="UserChatColor"
+             enabled="true" follows="left|top" height="65" label="Your chat" left="120"
+             mouse_opaque="true" name="user" width="65" />
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-75"
+             can_apply_immediately="true" color="1 1 1 1" control_name="AgentChatColor"
+             enabled="true" follows="left|top" height="65" label="Others' chat" left_delta="76"
+             mouse_opaque="true" name="agent" width="65" />
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-75"
+             can_apply_immediately="true" color="0.6 0.6 1 1"
+             enabled="true" follows="left|top" height="65" label="IMs" left_delta="76"
+             mouse_opaque="true" name="im" width="65" />
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-75"
+             can_apply_immediately="true" color="0.8 1 1 1"
+             enabled="true" follows="left|top"
+             height="65" label="System" left_delta="76" mouse_opaque="true"
+             name="system" width="65" />
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-75"
+             can_apply_immediately="true" color="0.82 0.82 0.99 1"
+             control_name="ScriptErrorColor" enabled="true" follows="left|top"
+             height="65" label="Script errors" left_delta="76" mouse_opaque="true"
+             name="script_error" width="65" />
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-146"
+             can_apply_immediately="true" color="0.7 0.9 0.7 1"
+             control_name="ObjectChatColor" enabled="true" follows="left|top"
+             height="65" label="Object chat" left="120" mouse_opaque="true"
+             name="objects" width="65" />
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-146"
+             can_apply_immediately="true" color="0.7 0.9 0.7 1"
+       control_name="ObjectIMColor" enabled="true" follows="left|top"
+             height="65" label="Object IMs" left_delta="76" mouse_opaque="true"
+       name="object_ims" width="65" />
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-146"
+             can_apply_immediately="true" color="0.7 0.9 0.7 1"
+             enabled="true" follows="left|top"
+             height="65" label="Owner chat" left_delta="76" mouse_opaque="true" name="owner"
+             width="65" />
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-146"
+             can_apply_immediately="true" color="0 0 0 1"
+             enabled="true" follows="left|top"
+             height="65" label="Bubble chat" left_delta="76" mouse_opaque="true"
+             name="background" width="65" />
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-146"
+             can_apply_immediately="true" color="0.6 0.6 1 1"
+             enabled="true" follows="left|top" height="65"
+             label="Links" left_delta="76" mouse_opaque="true" name="links" width="65" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
+     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
+     mouse_opaque="false" name="text_box3" v_pad="0" width="128">
+    Line Highlighting:
+  </text>
+  <check_box bottom_delta="-7" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+      initial_value="true" label="Highlight chat from friends" left="120"
+      mouse_opaque="true" name="HighlightFriendsChat" radio_style="false" width="270"/>
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-70"
+      can_apply_immediately="true" color="1 1 1 1" control_name="FriendsChatColor"
+      enabled="true" follows="left|top" height="65" label="Friends" left_delta="20"
+      mouse_opaque="true" name="FriendsChatColor" width="65" />
+  <check_box bottom_delta="-25" enabled="true" follows="left|top"
+     font="SansSerifSmall" height="16" initial_value="true"
+     label="Highlight local chat containing your name" left="120" mouse_opaque="true"
+     name="HighlightOwnNameInChat" radio_style="false" width="217" />
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+      initial_value="true" label="Highlight group chat containing your name" left_delta="0"
+      mouse_opaque="true" name="HighlightOwnNameInIM" radio_style="false" width="270"/>
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-70"
+      can_apply_immediately="true" color="1 1 1 1" control_name="OwnNameChatColor"
+      enabled="true" follows="left|top" height="65" label="Your name" left_delta="20"
+      mouse_opaque="true" name="OwnNameChatColor" width="65" />
+  <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="20" 
+      left="140" name="nick01_text" width="150">
+    Highlight nickname 1:
+  </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="3"
+      enabled="true" follows="left|top" font="SansSerif"
+      handle_edit_keys_directly="true" height="20" left_delta="125"
+      max_length="50" mouse_opaque="true" name="nick01"
+      select_all_on_focus_received="true" width="160" word_wrap="false" />
+  <text bottom_delta="-25" follows="left|top" font="SansSerifSmall" height="20" 
+      left="140" name="nick02_text" width="150">
+    Highlight nickname 2:
+  </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="3"
+      enabled="true" follows="left|top" font="SansSerif"
+      handle_edit_keys_directly="true" height="20" left_delta="125"
+      max_length="50" mouse_opaque="true" name="nick02"
+      select_all_on_focus_received="true" width="160" word_wrap="false" />
+  <text bottom_delta="-25" follows="left|top" font="SansSerifSmall" height="20"
+      left="140" name="nick03_text" width="150">
+    Highlight nickname 3:
+  </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="3"
+      enabled="true" follows="left|top" font="SansSerif"
+      handle_edit_keys_directly="true" height="20" left_delta="125"
+      max_length="50" mouse_opaque="true" name="nick03"
+      select_all_on_focus_received="true" width="160" word_wrap="false" />
+</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 70812a9..8b354b4 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,9 +2,18 @@
 <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|bottom" font="SansSerifSmall"
+             follows="left|top" font="SansSerifSmall"
             mouse_opaque="true" allow_text_entry="true" max_chars="128">
    <combo_item name="MyHome" value="My Home">
      My Home
@@ -17,14 +26,20 @@
    </combo_item>
  </combo_box>
  <button name="grid_btn" label="Grid Manager"
-          bottom_delta="0" left="330" height="16" width="100"
+          bottom_delta="-3" left="330" height="20" width="100"
-          follows="left|bottom" font="SansSerifSmall" halign="center"
+          follows="left|top" font="SansSerifSmall" halign="center"
                      mouse_opaque="true" scale_image="TRUE" />
  <check_box bottom="-44" enabled="true" follows="left|top"
       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,6 +59,34 @@
             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">
@@ -53,41 +96,53 @@
             font="SansSerifSmall" height="16" initial_value="false"
             label="Hide all group titles" left="151" mouse_opaque="true"
             name="show_all_title_checkbox" radio_style="false" width="256" />
-        <check_box bottom_delta="-18" follows="left|top"
+        <check_box bottom_delta="0" follows="left|top"
             font="SansSerifSmall" height="16" initial_value="false"
-             label="Hide my group title" left="151" name="show_my_title_checkbox"
+             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"
+  <spinner bottom_delta="-24" decimal_digits="0" enabled="true"
-                   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"
             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"
@@ -105,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="320"
+        <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
@@ -129,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="320"
+             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"
+             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="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"
             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"
+        <combo_box allow_text_entry="false" bottom_delta="0" 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:
-        </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"
             height="18" left="153" max_chars="20" mouse_opaque="true"
             name="time_combobox" width="146">
                <combo_item type="string" name="12HourTime" value="PST 12">
@@ -193,8 +210,14 @@
                        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"
-             follows="left|bottom" height="16" left="153" max_chars="135"
+             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="false" bottom_delta="0" enabled="true"
+             follows="left|top" height="18" 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">
                        System Default
@@ -251,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/en-us/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
index 4df33e2..2ed0869 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
@@ -29,9 +29,6 @@
        <combo_box allow_text_entry="false" bottom="-67" enabled="true" follows="left|top"
             height="18" left="185" max_chars="20" mouse_opaque="true"
             name="windowsize combo" width="150">
-                <combo_item type="string" length="1" enabled="true" name="640x480" value="640 x 480">
-                        640x480
-                </combo_item>
                <combo_item type="string" length="1" enabled="true" name="800x600" value="800 x 600">
                        800x600 
                </combo_item>
@@ -44,8 +41,16 @@
                <combo_item type="string" length="1" enabled="true" name="1024x768" value="1024 x 768">
                        1024x768
                </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="1280x720" value="1280 x 720">
-        </combo_box>
+      1280x720 (HDV720)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="1440x1080" value="1440 x 1080">
+      1440x1080 (HDV1080)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="1920x1080" value="1920 x 1080">
+      1920x1080 (HD1080)
+    </combo_item>
+  </combo_box>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-62" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
@@ -141,16 +146,16 @@
             name="QualityText2" v_pad="0" width="95">
                Quality
        </text>
-        <icon bottom="-89" color="0.12 0.12 0.12 1.0" height="14"
+        <icon bottom="-89" color="0.12 0.12 0.12 1.0" height="14" follows="left|top" 
             image_name="rounded_square.tga" left="173" name="LowGraphicsDivet"
             width="2" />
-        <icon bottom_delta="0" color="0.12 0.12 0.12 1.0" height="14"
+        <icon bottom_delta="0" color="0.12 0.12 0.12 1.0" height="14" follows="left|top"
             image_name="rounded_square.tga" left_delta="44" name="MidGraphicsDivet"
             width="2" />
-        <icon bottom_delta="0" color="0.12 0.12 0.12 1.0" height="14"
+        <icon bottom_delta="0" color="0.12 0.12 0.12 1.0" height="14" follows="left|top"
             image_name="rounded_square.tga" left_delta="44" name="HighGraphicsDivet"
             width="2" />
-        <icon bottom_delta="0" color="0.12 0.12 0.12 1.0" height="14"
+        <icon bottom_delta="0" color="0.12 0.12 0.12 1.0" height="14" follows="left|top"
             image_name="rounded_square.tga" left_delta="44" name="UltraGraphicsDivet"
             width="2" />
        <slider bottom="-90" can_edit_text="false" control_name="RenderQualityPerformance"
@@ -162,8 +167,8 @@
             follows="left|top" font="SansSerifSmall" height="16"
             initial_value="true" label="Custom" left="385" mouse_opaque="true"
             name="CustomSettings" radio_style="false" width="256" />
-        <view_border bevel_style="none" border_thickness="1" bottom="-375" follows="top|left"
+        <view_border bevel_style="none" border_thickness="1" bottom="-415" follows="left|top"
-             height="260" left="5" name="GraphicsBorder" width="485" />
+             height="300" left="5" name="GraphicsBorder" width="485" />
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-130" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="12"
@@ -235,26 +240,23 @@
             follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
             label="Avatar cloth" left_delta="0" mouse_opaque="true" name="AvatarCloth"
             radio_style="false" width="256" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-131" drop_shadow_visible="true" enabled="true" follows="left|top"
+       bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12"
+       font="SansSerifSmall" h_pad="0" halign="left" height="12" left_delta="0" 
-             left="457" mouse_opaque="true" name="DrawDistanceMeterText1" v_pad="0"
+       mouse_opaque="true" name="AvatarCountText" v_pad="0" width="128">
-             width="128">
+    Max. non-imposters:
-                m
+  </text>
-        </text>
+  <slider bottom_delta="-20" can_edit_text="true" control_name="RenderAvatarMaxVisible"
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       decimal_digits="0" enabled="true" follows="left|top" height="16"
-             bottom="-131" drop_shadow_visible="true" enabled="true" follows="left|top"
+       increment="1" initial_val="35" label="" 
-             font="SansSerifSmall" h_pad="0" halign="left" height="12"
+       label_width="0" left_delta="0" max_val="50" min_val="0" mouse_opaque="true"
-             left="463" mouse_opaque="true" name="DrawDistanceMeterText2" v_pad="0"
+       name="AvatarMaxVisible" show_text="true" width="100" />
-             width="128">
+        <slider bottom="-135" can_edit_text="true" control_name="RenderFarClip"
-                m
-        </text>
-        <slider bottom="-135" can_edit_text="false" control_name="RenderFarClip"
             decimal_digits="0" enabled="true" follows="left|top" height="16"
-             increment="8" initial_val="160" label="Draw distance:"
+             increment="4" initial_val="160" label="Draw distance (meters):"
-             label_width="140" left="215" max_val="512" min_val="32" mouse_opaque="true"
+             label_width="140" left="215" max_val="1024" min_val="32" mouse_opaque="true"
-             name="DrawDistance" show_text="true" width="255" />
+             name="DrawDistance" show_text="true" width="262" />
-        <slider bottom_delta="-20" can_edit_text="false" control_name="RenderMaxPartCount"
+        <slider bottom_delta="-20" can_edit_text="true" control_name="RenderMaxPartCount"
             decimal_digits="0" enabled="true" follows="left|top" height="16"
             increment="256" initial_val="4096"
             label="Max. particle count:" label_width="140" left_delta="0"
@@ -275,7 +277,7 @@
        <slider bottom_delta="-22" can_edit_text="false" control_name="RenderVolumeLODFactor"
             decimal_digits="3" enabled="true" follows="left|top" height="16"
             increment="0.125" initial_val="160" label="  Objects:"
-             label_width="140" left_delta="0" max_val="2" min_val="0"
+             label_width="140" left_delta="0" max_val="4" min_val="0"
             mouse_opaque="true" name="ObjectMeshDetail" show_text="false" width="223" />
        <slider bottom_delta="-20" can_edit_text="false" control_name="RenderFlexTimeFactor"
             decimal_digits="3" enabled="true" follows="left|top" height="16"
@@ -387,13 +389,13 @@
                        High
                </radio_item>
        </radio_group>
-        <button bottom="-400" enabled="true" font="SansSerif" halign="center" height="20"
+        <button bottom="4" enabled="true" font="SansSerif" halign="center" height="20"
             label="Recommended Settings" left="130" mouse_opaque="true"
-             name="Defaults" scale_image="true" width="170" />
+             name="Defaults" scale_image="true" width="170" follows="left|bottom" />
-        <button bottom="-400" enabled="true" font="SansSerif" halign="center" height="20"
+  <button bottom="4" enabled="true" font="SansSerif" halign="center" height="20"
             label="Hardware Options" label_selected="Hardware Options"
             left="310" mouse_opaque="true" name="GraphicsHardwareButton"
-             scale_image="true" width="170" />
+             scale_image="true" width="170" follows="left|bottom" />
        <string name="resolution_format">
                [RES_X] x [RES_Y]
        </string>
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 b0dd026..fe17e7a 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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" label="Communication" left="102" mouse_opaque="true" name="im"
+     height="408" label="IMs &amp; Logging" left="102" mouse_opaque="true" name="im"
     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"
@@ -22,6 +22,9 @@
  <string name="log_in_to_change">
    log in to change
  </string>
+  <string name="default_email_used">
+    using default address
+  </string>
  <check_box bottom="-45" enabled="true" follows="left|top" font="SansSerifSmall"
             height="16" initial_value="false" label="Send IM to email ([EMAIL])"
             left="148" mouse_opaque="true" name="send_im_to_email" radio_style="false"
@@ -61,7 +64,7 @@
  </text>
  <text_editor type="string" length="1" bottom_delta="-60" 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" />
+             mouse_opaque="true" name="busy_response" width="330" word_wrap="true" spell_check="true" />
  <button bottom_delta="-25" follows="top|right" height="22" label="IM Response Options"
     left="164" name="busy_adv_btn" tool_tip="Instant message Auto-Response options"
     width="180" />
@@ -101,8 +104,8 @@
             font="SansSerifSmall" height="16" initial_value="false"
             label="Include date with timestamps" left="148" mouse_opaque="true"
             name="log_date_timestamp" radio_style="false" width="237" />
-  <button bottom_delta="-22" follows="right|bottom" font="SansSerif" halign="center"
+  <button bottom_delta="-22" follows="left|top" font="SansSerif" halign="center"
-             height="20" label="Change Path" label_selected="Change Path" left="170"
+             height="20" label="Change Path" label_selected="Change Path" left="148"
             mouse_opaque="true" name="log_path_button" width="96" />
  <line_editor border_drop_shadow_visible="false" border_visible="false" bottom_delta="1"
             drop_shadow_visible="true" enabled="false" follows="top|left|right"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
index 2b9a551..7d6bb4a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
@@ -31,12 +31,12 @@
             decimal_digits="0" enabled="true" follows="left|top" height="15"
             increment="10" initial_val="50" left_delta="0" max_val="1000" min_val="10"
             mouse_opaque="true" name="cache_size" show_text="true" width="180" />
-        <button bottom="-55" bottom_delta="-4" enabled="true" follows="left|bottom"
+        <button bottom_delta="-4" enabled="true" follows="left|top"
-             font="SansSerif" halign="center" height="22" label="Clear Cache" left="340"
+             font="SansSerif" halign="center" height="22" label="Clear Disk Cache" left="340"
             left_delta="186" mouse_opaque="true" name="clear_cache" scale_image="true"
-             width="100" />
+             width="150" />
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-70" bottom_delta="-17" drop_shadow_visible="true" enabled="true"
+             bottom_delta="-17" drop_shadow_visible="true" enabled="true"
             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
             height="10" left="12" mouse_opaque="false" name="cache_location_label"
             v_pad="0" width="200">
@@ -56,12 +56,123 @@
             name="reset_cache" scale_image="true" width="100" />
        <check_box bottom="-173" bottom_delta="-25" control_name="ConnectionPortEnabled"
             enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Custom port connection" left="12"
+             initial_value="false" label="Enable custom outgoing port" left="12"
             mouse_opaque="true" name="connection_port_enabled" radio_style="false"
+       tool_tip="Enables custom port for outgoing connections" 
             width="256" />
        <spinner bottom="-193" bottom_delta="-20" control_name="ConnectionPort"
             decimal_digits="0" enabled="true" follows="left|top" height="16"
             increment="1" initial_val="13000" label="Port number:" label_width="75"
             left_delta="20" max_val="13050" min_val="13000" mouse_opaque="true"
-             name="connection_port" width="150" />
+             name="connection_port" width="140" />
+  
+  <!-- XMLRPC PROXY -->
+  <check_box bottom_delta="-25" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+             label="Enable XMLRPC proxy (Login, Land, and Money purchases)" left="15" mouse_opaque="true"
+             name="xmlrpc_proxy_enabled" radio_style="false" width="300" />
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-18" drop_shadow_visible="true" enabled="true"
+             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+             height="10" left_delta="20" mouse_opaque="false" name="xmlrpc_proxy_text_label"
+             v_pad="0" width="128">
+                Address:
+        </text>
+        <line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
+             height="20" left="112" name="xmlrpc_proxy_editor"
+             tool_tip="The name or IP address of the proxy you would like to use"
+             width="200" />
+        <spinner bottom_delta="-20" decimal_digits="0"
+             enabled="true" follows="left|top" height="16" increment="1"
+             initial_val="80" label="Port number:" label_width="75" left="35"
+             max_val="65535" min_val="10" mouse_opaque="true" name="xmlrpc_proxy_port"
+             width="140" />
+  <!-- SOCKS 5 PROXY -->
+  <check_box bottom_delta="-24" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+             label="Enable SOCKS 5 proxy" left="15" mouse_opaque="true"
+             name="socks5_proxy_enabled" radio_style="false" width="256" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-18" drop_shadow_visible="true" enabled="true"
+             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+             height="10" left="35" mouse_opaque="false" name="socks5_host_label"
+             v_pad="0" width="128">
+    SOCKS 5 host:
+  </text>
+  <line_editor bottom_delta="-6" enabled="true" follows="left|top" font="SansSerif"
+             height="20" left="113" name="socks5_proxy_host"
+             tool_tip="The name or IP address of the SOCKS5 proxy you would like to use"
+             width="200" />
+  <spinner bottom_delta="-20" decimal_digits="0"
+             enabled="true" follows="left|top" height="16" increment="1"
+             initial_val="80" label="Port number:" label_width="75" left="35"
+             max_val="65535" min_val="10" mouse_opaque="true" name="socks5_proxy_port"
+             width="140" />
+  <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="35" mouse_opaque="false" name="socks5_auth_label"
+             v_pad="0" width="128">
+    SOCKS 5 authentication:
+  </text>
+  <radio_group bottom_delta="-6" draw_border="false" follows="left|top" height="20" left="35"
+             name="socks5_auth" width="420">
+    <radio_item bottom="0" height="20" left_delta="80" name="None" width="50"
+        tool_tip="No authentication">
+      None
+    </radio_item>
+    <radio_item bottom="0" height="20" left_delta="50" name="UserPass" width="50"
+        tool_tip="Username / Password authentication">
+      Username / Password
+    </radio_item>
+  </radio_group>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-16" drop_shadow_visible="true" enabled="true"
+             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+             height="10" left="122" mouse_opaque="false" name="socks5_username_label"
+             v_pad="0" width="128">
+    Username:
+  </text>
+  <line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
+             height="20" left="200" name="socks5_proxy_username"
+             tool_tip="Username for the Socks5 proxy"
+             width="200" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-14" drop_shadow_visible="true" enabled="true"
+             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+             height="10" left="122" mouse_opaque="false" name="socks5_password_label"
+             v_pad="0" width="128">
+    Password:
+  </text>
+  <line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
+             height="20" left="200" name="socks5_proxy_password"
+             tool_tip="Password for the Socks5 proxy"
+             width="200" />
+  <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="35" mouse_opaque="false" name="http_proxy_label"
+     v_pad="0" width="128">
+    HTTP proxy:
+  </text>
+  <radio_group bottom_delta="-8" draw_border="false" follows="left|top" height="20" left="35"
+             name="socks5_http_proxy_type" width="380" >
+    <radio_item height="20" bottom="0" left="100" name="None" width="50"
+        tool_tip="No HTTP proxy">
+      None
+    </radio_item>
+    <radio_item height="20" bottom="0" left="170" name="Socks" width="50"
+        tool_tip="Use Socks for HTTP proxy">
+      SOCKS 5
+    </radio_item>
+    <radio_item height="20" bottom="0" left="250" name="Web" width="50"
+        tool_tip="Use web proxy for HTTP proxy">
+      Web
+    </radio_item>
+  </radio_group>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
index f0b789e..58a2989 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
@@ -2,21 +2,62 @@
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
     height="408" label="Skins" left="102" mouse_opaque="true"
     name="Skins panel" width="517">
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
-             mouse_opaque="true" name="muting_text" v_pad="0" width="400">
+             mouse_opaque="true" name="muting_text" v_pad="0" width="500">
-                Select a Skin (Requires Restart):
+    Select a skin (requires restart). (Please see the skin folders for information and credits)
-        </text>
+  </text>
  <radio_group bottom="0" draw_border="false" follows="top|left" height="380" left="12"
             name="skin_selection" width="480">
    <radio_item bottom="-20" height="20" left="0" name="default" width="480">
      Default
    </radio_item>
-    <radio_item bottom="-180" height="20" left="0" name="silver" width="480">
+    <radio_item bottom_delta="-50" height="20" left="0" name="silver" width="480">
      Silver
    </radio_item>
+    <radio_item bottom_delta="-50" height="20" left="0" name="dark" width="480">
+      Dark
+    </radio_item>
+    <radio_item bottom_delta="-50" height="20" left="0" name="gemini" width="480">
+      Gemini
+    </radio_item>
  </radio_group>
-  <button left="130" bottom="-160" width="298" height="130" name="classic_preview" label="" scale_image="true" image_selected="skin_thumbnail_default.png" image_unselected="skin_thumbnail_default.png" image_hover_selected="skin_thumbnail_default.png" image_hover_unselected="skin_thumbnail_default.png"/>
+  
-  <button left="130" bottom="-320" width="298" height="130" name="silver_preview" label="" scale_image="true" image_selected="skin_thumbnail_silver.png" image_hover_selected="skin_thumbnail_silver.png" image_unselected="skin_thumbnail_silver.png" image_hover_unselected="skin_thumbnail_silver.png"/>
+  <button left="130" bottom="-125" width="216" height="95" name="classic_preview" 
+          scale_image="true" label="" image_selected="skin_thumbnail_default.png" 
+          image_unselected="skin_thumbnail_default.png" image_hover_selected="skin_thumbnail_default.png"
+          image_hover_unselected="skin_thumbnail_default.png" follows="left|top" />
+  <button left="130" bottom_delta="-100" width="216" height="95" name="silver_preview" 
+          scale_image="true" label="" image_selected="skin_thumbnail_silver.png" 
+          image_hover_selected="skin_thumbnail_silver.png" image_unselected="skin_thumbnail_silver.png" 
+          image_hover_unselected="skin_thumbnail_silver.png" follows="left|top" />
+  <button left="130" bottom_delta="-100" width="216" height="95" name="dark_preview"
+          scale_image="true" label="" image_selected="skin_thumbnail_dark.png"
+          image_hover_selected="skin_thumbnail_dark.png" image_unselected="skin_thumbnail_dark.png"
+          image_hover_unselected="skin_thumbnail_dark.png" follows="left|top" />
+  <button left="130" bottom_delta="-100" width="216" height="95" name="gemini_preview" 
+          scale_image="true" label="" image_selected="skin_thumbnail_gemini.png" 
+          image_hover_selected="skin_thumbnail_gemini.png" image_unselected="skin_thumbnail_gemini.png" 
+          image_hover_unselected="skin_thumbnail_gemini.png" follows="left|top" />
+  <text name="skin_current_text"
+              left="10" bottom="5" halign="left" height="12"
+        follows="left|bottom" h_pad="0" v_pad="0"
+        bg_visible="false" drop_shadow_visible="true"
+        border_visible="false" border_drop_shadow_visible="false"
+              font="SansSerif" mouse_opaque="true">
+    Other Skin Name:
+  </text>
+  <line_editor name="skin_current_edit"
+               bottom_delta="0" left_delta="120" height="20" width="120"
+               follows="left|bottom" font="SansSerif"
+               bevel_style="in" border_style="line" border_thickness="1"
+               max_length="31" mouse_opaque="true"
+               handle_edit_keys_directly="true"
+               select_all_on_focus_received="true" />
+  <button name="save_skin" label="Save"
+          bottom_delta="-2" left_delta="120" height="24" width="90"
+          follows="left|center" font="SansSerif" halign="center"
+                mouse_opaque="true" scale_image="TRUE" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
index 1ec3fcd..b4939ca 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" label="Voice Chat" left="102" mouse_opaque="true" name="chat"
+     height="408" label="Voice" left="102" mouse_opaque="true" name="chat"
     width="517">
        <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-26"
             embedded_items="false" enabled="false" follows="left|top"
@@ -55,7 +55,7 @@
        <button bottom_delta="-25" follows="left|top" font="SansSerif" halign="center"
             height="20" label="Set Key" left_delta="0" mouse_opaque="true"
             name="set_voice_hotkey_button" width="115" />
-        <button bottom_delta="0" follows="left" font="SansSerif" halign="center" height="20"
+        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" height="20"
             label="Middle Mouse Button" left_delta="120" mouse_opaque="true"
             name="set_voice_middlemouse_button" width="160" />
        <text allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-25"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
index 144f7db..7de8ef7 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" label="Web" left="102" mouse_opaque="true" name="web"
+     height="408" label="Web Browser" left="102" mouse_opaque="true" name="web"
     width="517">
        <radio_group bottom="-45" draw_border="false" follows="top|left" height="40" left="12"
             name="use_external_browser" width="480">
@@ -13,72 +13,56 @@
                        Use built-in web browser
                </radio_item>
        </radio_group>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        <button bottom_delta="-30" enabled="true" follows="left|top" font="SansSerif"
-             bottom_delta="-25" drop_shadow_visible="true" enabled="true"
+             halign="center" height="22" label="Clear Built-In Browser Cache" left="35"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+             mouse_opaque="true" name="clear_cache" scale_image="true" width="250" />
-             height="10" left="15" mouse_opaque="false" name="cache_size_label_l"
+        <check_box bottom_delta="-35" enabled="true" follows="left|top" 
-             v_pad="0" width="128">
+                   font="SansSerifSmall" height="16" initial_value="false"
-                Browser Cache:
+             label="Accept cookies while using built-in web browser" left="15" mouse_opaque="true"
-        </text>
+       tool_top="Allows the built-in web browser to accept cookies from websites" 
-        <button bottom_delta="-10" enabled="true" follows="left|bottom" font="SansSerif"
-             halign="center" height="22" label="Clear Now" left="140"
-             mouse_opaque="true" name="clear_cache" scale_image="true" width="100" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-30" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left="15" mouse_opaque="false" name="cookie_label" v_pad="0"
-             width="128">
-                Cookies:
-        </text>
-        <check_box bottom_delta="-7" enabled="true" follows="left|top" 
-                 font="SansSerifSmall" height="16" initial_value="false"
-             label="Accept cookies from sites" left="140" mouse_opaque="true"
             name="cookies_enabled" radio_style="false" width="256" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        <button  bottom_delta="-25" enabled="true" follows="left|top" font="SansSerif"
-             bottom_delta="-24" drop_shadow_visible="true" enabled="true"
+             halign="center" height="20" label="Clear Cookies" left_delta="20" 
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+             tool_tip="Clear Cookies"
-             height="10" left="15" mouse_opaque="false" name="proxy_label" v_pad="0"
+             mouse_opaque="true" name="clear_ookies" scale_image="true" width="110" />
-             width="128">
+        <check_box bottom_delta="-35" enabled="true"
-                Web Proxy:
-        </text>
-        <check_box bottom_delta="-7" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Enable web proxy" left="140" mouse_opaque="true"
+             label="Enable proxy for built-in web browser" left="15" mouse_opaque="true"
             name="web_proxy_enabled" radio_style="false" width="256" />
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-25" drop_shadow_visible="true" enabled="true"
+             bottom_delta="-18" drop_shadow_visible="true" enabled="true"
             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left="140" mouse_opaque="false" name="proxy_text_label"
+             height="10" left_delta="20" mouse_opaque="false" name="proxy_text_label"
             v_pad="0" width="128">
                Address:
        </text>
        <line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
-             height="20" left="217" name="web_proxy_editor"
+             height="20" left="112" name="web_proxy_editor"
             tool_tip="The name or IP address of the proxy you would like to use"
             width="200" />
-        <spinner bottom_delta="-25" decimal_digits="0"
+        <spinner bottom_delta="-20" decimal_digits="0"
             enabled="true" follows="left|top" height="16" increment="1"
-             initial_val="80" label="Port number:" label_width="75" left="140"
+             initial_val="80" label="Port number:" label_width="75" left="35"
             max_val="12000" min_val="10" mouse_opaque="true" name="web_proxy_port"
             width="140" />
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-25" drop_shadow_visible="true" enabled="true"
+             bottom_delta="-30" drop_shadow_visible="true" enabled="true"
             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
             height="10" left="15" mouse_opaque="false" name="cache_size_label_l"
-             v_pad="0" width="128">
+             v_pad="0" width="200">
-                World search:
+    Custom All (web) search tab URL:
-        </text>
+  </text>
-        <line_editor bottom_delta="-8" enabled="true" follows="left|top"
+        <line_editor bottom_delta="-25" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="18" left="100" name="world_search_editor"
+             font="SansSerifSmall" height="18" left="15" name="world_search_editor"
             tool_tip="Address of the world search engine you would like to use"
-             width="355" />
+             width="400" />
-        <button bottom_delta="-22" enabled="true" follows="left|bottom" font="SansSerif"
+        <button bottom_delta="-22" enabled="true" follows="left|top" font="SansSerif"
-             halign="center" height="18" label="Reset" left="100" 
+             halign="center" height="20" label="Reset" left="15" 
             tool_tip="Reset to default"
-             mouse_opaque="true" name="world_search_reset_default" scale_image="true" width="65" />
+             mouse_opaque="true" name="world_search_reset_default" scale_image="true" width="80" />
-        <button  bottom_delta="0" enabled="true" follows="left|bottom" font="SansSerif"
+        <button  bottom_delta="0" enabled="true" follows="left|top" font="SansSerif"
-             halign="center" height="18" label="Clear" left="170" 
+             halign="center" height="20" label="Clear" left_delta="85" 
             tool_tip="clear field"
-             mouse_opaque="true" name="world_search_clear" scale_image="true" width="65" />
+             mouse_opaque="true" name="world_search_clear" scale_image="true" width="80" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml
index 603f2d8..4639ef3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml
@@ -41,15 +41,15 @@
  </text>
  <slider name="near_me_range" label="" control_name="NearMeRange"
-          bottom_delta="0" left_delta="62" width="110" height="15"
+          bottom_delta="0" left_delta="58" width="110" height="15"
-          follows="left|top" min_val="5" max_val="512" increment="1"
+          follows="left|top" min_val="5" max_val="1024" increment="1"
-          initial_val="96" decimal_digits="0" />
+          initial_val="96" decimal_digits="0" can_edit_text="true" />
  <text name="meters"
-        bottom_delta="0" left="180" height="15" width="40"
+        bottom_delta="0" left_delta="113" height="15" width="40"
        h_pad="0" halign="left" v_pad="0" follows="left|top"
        bg_visible="false" border_drop_shadow_visible="false"
-        border_visible="false" drop_shadow_visible="true" 
+        border_visible="false" drop_shadow_visible="true"
        font="SansSerifSmall" mouse_opaque="true">
    m
  </text>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_region_covenant.xml b/linden/indra/newview/skins/default/xui/en-us/panel_region_covenant.xml
index 5e28bdc..9bbdbd3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_region_covenant.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_region_covenant.xml
@@ -48,7 +48,7 @@
        <text_editor type="string" length="1" bottom="-279" embedded_items="false" enabled="false"
             follows="left|top" font="SansSerifSmall" height="194"
             left="120" max_length="65535" mouse_opaque="true" name="covenant_editor"
-             width="340" word_wrap="true">
+             width="340" word_wrap="true" spell_check="true">
                There is no Covenant provided for this Estate.
        </text_editor>
        <button bottom_delta="-25" follows="left|top" font="SansSerifSmall" height="18"
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 84ce9d0..5dd738a 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
@@ -25,7 +25,7 @@ regions in the estate.
                (unknown)
        </text>
        <view_border bevel_style="in" border="true" border_thickness="1" bottom_delta="-295"
-             follows="top|left" height="290" left="6" width="250" />
+             follows="top|left" height="350" left="6" width="250" />
        <check_box bottom_delta="265" follows="left|top" height="20" label="Use Global Time"
             left="12" name="use_global_time_check" width="200" />
        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
@@ -69,13 +69,12 @@ regions in the estate.
             left="12" name="allow_direct_teleport" width="80" />
        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
             name="allow_direct_teleport_help" right="250" width="18" />
-        <text bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="20"
+  <text bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="20"
-             left="10" name="abuse_email_text" width="180">
+      left="10" name="abuse_email_text" width="180">
-                Abuse email address:
+    Abuse email address:
-        </text>
+  </text>
-        <line_editor bottom_delta="-16" follows="top|left" height="19" left="15" max_length="254"
+  <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/panel_region_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_region_general.xml
index 6302428..70df1df 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_region_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_region_general.xml
@@ -58,16 +58,21 @@
        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
             left="205" name="parcel_search_help" width="18" />
        <spinner bottom_delta="-40" follows="left|top" height="20" increment="1"
-             label="Agent Limit" label_width="97" left="10" max_val="100" min_val="1"
+             label="Agent Limit" label_width="100" left="10" max_val="100" min_val="1"
             name="agent_limit_spin" width="170" />
        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
             left="205" name="agent_limit_help" width="18" />
        <spinner bottom_delta="-20" follows="left|top" height="20" increment="0.5"
-             label="Object Bonus" label_width="97" left="10" max_val="10" min_val="1"
+             label="Object Bonus" label_width="100" left="10" max_val="10" min_val="1"
             name="object_bonus_spin" width="170" />
        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
             left="205" name="object_bonus_help" width="18" />
-        <text bottom_delta="-30" follows="left|top" height="20" label="Maturity" left="10"
+  <spinner bottom_delta="-20" follows="left|top" height="20" increment="0.5"
+             label="Minimum Agent Age" label_width="100" left="10" max_val="1000" min_val="0"
+             name="minimum_agent_age" width="170" />
+  <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+             left="205" name="minimum_agent_age_help" width="18" />
+  <text bottom_delta="-30" follows="left|top" height="20" label="Maturity" left="10"
             name="access_text" width="100">
                Rating:
        </text>
@@ -87,7 +92,7 @@
             left="205" name="access_help" width="18" />
        <button bottom_delta="-30" enabled="false" follows="left|top" height="20" label="Apply"
             left="108" name="apply_btn" width="100" />
-        <button bottom_delta="-60" follows="left|top" height="20"
+        <button bottom_delta="-40" follows="left|top" height="20"
             label="Teleport Home One User..." left="10" name="kick_btn" width="250" />
        <button bottom_delta="-23" follows="left|top" height="20"
             label="Teleport Home All Users..." left="10" name="kick_all_btn" width="250" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_region_open_region_settings.xml b/linden/indra/newview/skins/default/xui/en-us/panel_region_open_region_settings.xml
new file mode 100644
index 0000000..3eb7806
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_region_open_region_settings.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="100" follows="top|left" height="320" label="Region Settings"
+     left="0" name="RegionSettings" width="480">
+        <spinner bottom_delta="-40" follows="left|top" height="20" increment="1"
+             label="Default Draw Distance" label_width="175" left="10" max_val="10000" min_val="1"
+             name="draw_distance" width="250" />
+  <check_box bottom_delta="-20" follows="left|top" height="20" label="Force Draw Distance"
+             left="10" name="force_draw_distance" width="80" />
+  <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+             left="285" name="force_draw_distance_help" width="18" />
+  <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
+             label="Max Drag Distance" label_width="175" left="10" max_val="1000 0" min_val="0"
+             name="max_drag_distance" width="250" />
+  <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
+             label="Max Prim Scale" label_width="175" left="10" max_val="10000" min_val="0"
+             name="max_prim_scale" width="250" />
+  <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
+             label="Min Prim Scale" label_width="175" left="10" max_val="10000" min_val="0"
+             name="min_prim_scale" width="250" />
+  <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
+             label="Max Physical Prim Scale" label_width="175" left="10" max_val="10000" min_val="0"
+             name="max_phys_prim_scale" width="250" />
+  <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
+             label="Max Hollow Size" label_width="175" left="10" max_val="100" min_val="0"
+             name="max_hollow_size" width="250" />
+  <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
+             label="Min Hole Size" label_width="175" left="10" max_val="100" min_val="0"
+             name="min_hole_size" width="250" />
+  <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
+             label="Max Link Count" label_width="175" left="10" max_val="100000" min_val="0"
+             name="max_link_count" width="250" />
+  <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
+             label="Max Link Count Phys" label_width="175" left="10" max_val="100000" min_val="0"
+             name="max_link_count_phys" width="250" />
+  <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
+             label="Max Inventory Items To Transfer" label_width="175" left="10" max_val="10000" min_val="-1"
+             name="max_inventory_items_transfer" width="250" />
+  <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+             left="285" name="max_inventory_items_transfer_help" width="18" />
+  <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
+             label="Show Tags" label_width="175" left="10" max_val="2" min_val="0"
+             name="show_tags" width="250" />
+  <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+             left="285" name="show_tags_help" width="18" />
+  <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
+     label="Max Groups" label_width="175" left="10" max_val="1000" min_val="-1"
+     name="max_groups" width="250" />
+  <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+             left="285" name="max_groups_help" width="18" />
+  <check_box bottom_delta="-20" follows="left|top" height="20" label="Render Water" left="10"
+             name="render_water" width="80" />
+        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+             left="285" name="render_water_help" width="18" />
+        <check_box bottom_delta="-20" follows="left|top" height="20" label="Allow Minimap"
+             left="10" name="allow_minimap" width="80" />
+        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+             left="285" name="allow_minimap_help" width="18" />
+        <check_box bottom_delta="-20" follows="left|top" height="20" label="Allow Physical Prims"
+             left="10" name="allow_physical_prims" width="80" />
+        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+             left="285" name="allow_physical_prims_help" width="18" />
+        <check_box bottom_delta="-20" follows="left|top" height="20" label="Enable Teen Mode"
+             left="10" name="enable_teen_mode" width="80" />
+        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+             left="285" name="enable_teen_mode_help" width="18" />
+  <check_box bottom_delta="-20" follows="left|top" height="20" label="Enforce Max Build Constraints"
+             left="10" name="enforce_max_build" width="80" />
+        <check_box bottom_delta="-20" follows="left|top" height="20"
+             label="Allow Parcel WindLight" left="10"
+             name="allow_parcel_windlight"
+             width="80" />
+        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+             left="285" name="allow_parcel_windlight_help" width="18" />
+  <button bottom_delta="-30" enabled="false" follows="left|top" height="20" label="Apply"
+             left="108" name="apply_ors_btn" width="100" />
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
index 1ef815e..46ba64a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
@@ -96,8 +96,8 @@
             font="SansSerifSmall" handle_edit_keys_directly="false" height="11"
             label="Search" left="-94" max_length="254" mouse_opaque="true"
             name="search_editor" select_all_on_focus_received="false"
-             select_on_focus="false" tab_group="1" tool_tip="Search Second Life"
+             select_on_focus="false" tab_group="1" tool_tip="Inworld search"
-             width="78"/>
+             width="78" spell_check="true"/>
        <button bottom="-17" enabled="true" follows="right|bottom" font="SansSerifSmall"
             halign="center" height="16" image_unselected="status_search_btn.png" image_selected="status_search_btn_pressed.png" image_disabled_selected="status_search_btn_pressed.png" image_disabled="status_search_btn.png"
             label="" label_selected="" left="-16" mouse_opaque="true" name="search_btn"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_top_pick.xml b/linden/indra/newview/skins/default/xui/en-us/panel_top_pick.xml
index 03d0919..85ad350 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_top_pick.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_top_pick.xml
@@ -8,7 +8,7 @@
             width="400" />
        <text_editor enabled="false" follows="left|top" font="SansSerif"
             height="90" left="20" max_length="1023" name="desc_editor"
-             width="400" word_wrap="true" />
+             width="400" word_wrap="true" spell_check="true" />
        <line_editor enabled="false" follows="left|top" font="SansSerif"
             height="20" left="20" name="location_editor" 
             width="400" />
@@ -23,7 +23,7 @@
                Sort:
        </text>
        <line_editor bottom_delta="5" follows="left|top" height="16" left="320"
-             name="sort_order_editor" width="25" />
+             name="sort_order_editor" width="25" spell_check="true" />
        <check_box bottom_delta="0" follows="left|top" height="20" label="Enabled" left="360"
             name="enabled_check" width="80" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_voice_enable.xml b/linden/indra/newview/skins/default/xui/en-us/panel_voice_enable.xml
deleted file mode 100644
index a5de96c..0000000
--- a/linden/indra/newview/skins/default/xui/en-us/panel_voice_enable.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="false" bottom="4" enabled="true" height="240" left="8"
-     mouse_opaque="true" name="content_panel" width="404">
-        <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" embedded_items="false"
-             enabled="false" font="SansSerifSmall" height="85" hide_border="true"
-             hide_scrollbar="true" left_delta="0" max_length="65535" mouse_opaque="true"
-             name="voice_intro_text1" tab_stop="false" width="400" word_wrap="true">
-                Welcome to Second Life Voice Chat! Voice Chat enables you to speak with other Residents. This wizard will guide you through the steps necessary to set up Voice Chat. Using Voice Chat requires audio speakers and, if you wish to speak with others, a microphone or stereo headset with microphone.
-        </text_editor>
-        <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" embedded_items="false"
-             enabled="false" font="SansSerifSmall" height="50" hide_border="true"
-             hide_scrollbar="true" left_delta="0" max_length="65535" mouse_opaque="true"
-             name="voice_intro_text2" tab_stop="false" width="400" word_wrap="true">
-                Voice Chat is enabled by default. Do you wish to continue using Voice Chat?
-        </text_editor>
-        <radio_group bottom_delta="-30" draw_border="false" enabled="true" follows="left|top"
-             height="40" left="10" mouse_opaque="true" name="voice_enable" width="364">
-                <radio_item type="string" length="1" bottom="-19" follows="left|top" height="16" left="3" name="1" width="315">
-                        Yes, continue using Voice Chat.
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-35" follows="left|top" height="16" left="3" name="0" width="315">
-                        No, disable Voice Chat.
-                </radio_item>
-        </radio_group>
-        <text_editor length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-50"
-             embedded_items="false" enabled="false" font="SansSerifSmall" height="40"
-             hide_border="true" hide_scrollbar="true" left="0" max_length="65535"
-             name="voice_intro_text3" tab_stop="false" width="400" word_wrap="true">
-                You can enable Voice Chat at any time by going to the Voice Chat tab in Preferences.
-        </text_editor>
-        <text_editor length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="0"
-             embedded_items="false" enabled="false" font="SansSerifSmall" height="40"
-             hide_border="true" hide_scrollbar="true" left="0" max_length="65535"
-             name="voice_intro_text4" tab_stop="false" width="400" word_wrap="true">
-                Click the Next button to configure Voice Chat preferences or click Finish to continue using Second Life.
-        </text_editor>
-</panel>
-\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_voice_options.xml b/linden/indra/newview/skins/default/xui/en-us/panel_voice_options.xml
deleted file mode 100644
index 4c6edfd..0000000
--- a/linden/indra/newview/skins/default/xui/en-us/panel_voice_options.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="false" bottom="36" height="240" left="8" name="content_panel"
-     width="404">
-        <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" embedded_items="false"
-             enabled="false" font="SansSerifSmall" height="30" hide_border="true"
-             hide_scrollbar="true" left_delta="0" max_length="65535"
-             name="voice_intro_text1" tab_stop="false" width="414" word_wrap="true">
-                Use the options below to configure your Voice Chat experience.
-        </text_editor>
-        <radio_group bottom_delta="-40" draw_border="false" follows="left|top" height="40" left="10"
-             name="ear_location" width="364">
-                <radio_item type="string" length="1" bottom="-19" follows="left|top" height="16" left="3" name="0" width="315">
-                        Hear Voice Chat from camera position.
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-35" follows="left|top" height="16" left="3" name="1" width="315">
-                        Hear Voice Chat from avatar position.
-                </radio_item>
-        </radio_group>
-        <check_box bottom_delta="-20" control_name="VoiceCallsFriendsOnly" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Only allow Friends to initiate Voice Calls with me" left="20"
-             left_delta="2" name="friends_only_check" width="200" />
-        <check_box bottom_delta="-20" control_name="PushToTalkToggle" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Use Push-to-Talk in toggle mode" left_delta="0"
-             name="push_to_talk_toggle_check" width="200" />
-        <text type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-20"
-             embedded_items="false" follows="left|top" font="SansSerifSmall" height="16"
-             hide_border="true" hide_scrollbar="true" left_delta="4" max_length="65535"
-             name="push_to_talk_label" width="445" word_wrap="true">
-                Push-to-Talk trigger:
-        </text>
-        <line_editor border_drop_shadow_visible="false" border_visible="false" bottom_delta="-20"
-             control_name="PushToTalkButton" drop_shadow_visible="true" enabled="false"
-             follows="top|left" font="SansSerifSmall" halign="right" height="19"
-             left_delta="0" max_length="254" name="modifier_combo" width="280" />
-        <button bottom_delta="-25" follows="left|top" font="SansSerif" halign="center"
-             height="20" label="Set Key" left_delta="0" name="set_voice_hotkey_button"
-             width="115" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="20" label="Middle Mouse Button" left_delta="120"
-             name="set_voice_middlemouse_button" width="160" />
-</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
index 3849efd..c7769cc 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
@@ -3,24 +3,17 @@
     follows="right|bottom" height="67" left="0" mouse_opaque="true"
     name="windlight_remote" use_bounding_rect="true" width="182">
        <panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="67" left="0" width="182" />
-        <slider bottom="-20" can_edit_text="false" control_name="RenderFarClip"
+        <slider bottom="-20" can_edit_text="true" control_name="RenderFarClip"
       decimal_digits="0" enabled="true" height="18"
-       increment="8" initial_val="160" label="Draw distance:"
+       increment="4" initial_val="160" label="Draw distance:"
-       label_width="78" left="6" max_val="512" min_val="32" mouse_opaque="true"
+       label_width="74" left="4" max_val="1024" min_val="32" mouse_opaque="true"
-       name="DrawDistance" show_text="true" width="170" />
+       name="DrawDistance" show_text="true" width="174" />
-  <slider bottom_delta="-20" can_edit_text="false" control_name="RenderMaxPartCount"
+  <slider bottom_delta="-20" can_edit_text="true" control_name="RenderMaxPartCount"
       decimal_digits="0" enabled="true" follows="left|top" height="18"
       increment="256" initial_val="4096"
-       label="Max. particles:" label_width="78" left_delta="0"
+       label="Max. particles:" label_width="74" left_delta="0"
       max_val="8192" min_val="0" mouse_opaque="true" name="MaxParticleCount"
-       show_text="true" width="176" />
+       show_text="true" width="174" />
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-14" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12"
-             left="170" mouse_opaque="true" name="DrawDistanceMeterText2" v_pad="0"
-             width="8">
-    m
-  </text>
        <panel bottom="13" filename="panel_windlight_controls.xml" left="0" width="182" />
  <string name="atmosphere">
    Atmosphere
diff --git a/linden/indra/newview/skins/default/xui/en-us/rlva_strings.xml b/linden/indra/newview/skins/default/xui/en-us/rlva_strings.xml
new file mode 100755
index 0000000..f82a568
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/rlva_strings.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<rlva_strings>
+  <strings>
+    <!-- Primarily used when @showloc restricted -->
+    <string name="hidden_generic">(Hidden)</string>
+    <string name="hidden_parcel">(Hidden parcel)</string>
+    <string name="hidden_region">(Hidden region)</string>
+    <!-- Received/sent IMs will be replaced by the matching string when @recvim/sendim restricted -->
+    <string name="blocked_recvim">*** IM blocked by your viewer</string>
+    <string name="blocked_sendim">*** IM blocked by sender's viewer</string>
+    <!-- Shown as notifications -->
+    <string name="blocked_viewxxx">Unable to open [TYPE] due to RLV restrictions</string>
+    <!-- Sent as "Busy" messages to the remote party -->
+    <string name="blocked_recvim_remote">
+      The Resident you messaged is prevented from reading your instant messages at the moment, please try again later.
+    </string>
+    <string name="blocked_tplure_remote">
+      The Resident you invited is prevented from accepting teleport offers. Please try again later.
+    </string>
+  </strings>
+  <!-- Generic names used to replace resident names when @shownames restricted -->
+  <anonyms>
+    <anonym>A resident</anonym>
+    <anonym>This resident</anonym>
+    <anonym>That resident</anonym>
+    <anonym>An individual</anonym>
+    <anonym>This individual</anonym>
+    <anonym>That individual</anonym>
+    <anonym>A person</anonym>
+    <anonym>This person</anonym>
+    <anonym>That person</anonym>
+    <anonym>A stranger</anonym>
+    <anonym>This stranger</anonym>
+    <anonym>That stranger</anonym>
+    <anonym>A being</anonym>
+    <anonym>This being</anonym>
+    <anonym>That being</anonym>
+    <anonym>An agent</anonym>
+    <anonym>This agent</anonym>
+    <anonym>That agent</anonym>
+    <anonym>A soul</anonym>
+    <anonym>This soul</anonym>
+    <anonym>That soul</anonym>
+    <anonym>Somebody</anonym>
+    <anonym>Some people</anonym>
+    <anonym>Someone</anonym>
+    <anonym>Mysterious one</anonym>
+    <anonym>An unknown being</anonym>
+    <anonym>Unidentified one</anonym>
+    <anonym>An unknown person</anonym>
+  </anonyms>
+  <behaviour-notifications>
+    <!--
+    <notification behaviour="defaultwear" type="add">Text goes here</notification>
+    <notification behaviour="defaultwear" type="rem">Text goes here</notification>
+    -->
+  </behaviour-notifications>
+</rlva_strings>
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 a17d0de..d3c9df1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/strings.xml
@@ -20,6 +20,15 @@
  <string name="TitleBarMultiple">
    [FIRST_NAME] [LAST_NAME] on [GRID_NAME]
  </string>
+  <string name="copy_obj_key_info">
+    Copied key(s) for:
+  </string>
+  <string name="TeleportOfferMaturity">
+    [NAME] is offering a TP to [DESTINATION]
+  </string>
+  <string name="TeleportLureMaturity">
+    [NAME]'s teleport lure is to [DESTINATION]
+  </string>
  <!-- Login -->
  <string name="LoginInProgress">Logging in. [APP_NAME] may appear frozen.  Please wait.</string>
@@ -225,7 +234,7 @@
  <string name="avi_movie_file">AVI Movie File</string>
  <string name="xaf_animation_file">XAF Anim File</string>
  <string name="xml_file">XML File</string>
-  <string name="dot_raw_file">RAW File</string>
+  <string name="raw_file">RAW File</string>
        <string name="compressed_image_files">Compressed Images</string>
        <string name="load_files">Load Files</string>
        <string name="choose_the_directory">Choose Directory</string>
diff --git a/linden/indra/newview/skins/default/xui/es/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/es/floater_instant_message.xml
index 30b23d1..68ed9c6 100644
--- a/linden/indra/newview/skins/default/xui/es/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_instant_message.xml
@@ -33,6 +33,9 @@
        <string name="unavailable_text_label">
                Para esta llamada no está disponible el chat de texto.
        </string>
+        <string name="add_friend_string">
+                Añadir como amigo
+        </string>
        <flyout_button label="Perfil..." name="profile_callee_btn"/>
        <button label="Llamar" name="start_call_btn"/>
        <button label="Colgar" name="end_call_btn"/>
diff --git a/linden/indra/newview/skins/default/xui/es/floater_tools.xml b/linden/indra/newview/skins/default/xui/es/floater_tools.xml
index e6ff6b0..f4b5787 100644
--- a/linden/indra/newview/skins/default/xui/es/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_tools.xml
@@ -122,8 +122,11 @@
                                Transferir
                        </string>
                        <button label="Transferir..." label_selected="Transferir..." name="button deed" tool_tip="Los objetos compartidos por el grupo pueden ser transferidos por un oficial del grupo."/>
-                        <check_box label="Permitir a cualquiera que lo mueva" name="checkbox allow everyone move"/>
+                        <text name="Anyone can:">
-                        <check_box label="Permitir a cualquiera que lo copie" name="checkbox allow everyone copy"/>
+                                Cualquiera:
+                        </text>
+                        <check_box label="Moverlo" name="checkbox allow everyone move"/>
+                        <check_box label="Copiarlo" name="checkbox allow everyone copy"/>
                        <check_box label="Mostrar en la búsqueda" name="search_check" tool_tip="Dejar que la gente vea este objeto en los resultados de la búsqueda"/>
                        <check_box label="En venta" name="checkbox for sale"/>
                        <text name="Cost">
diff --git a/linden/indra/newview/skins/default/xui/es/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/es/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/es/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</menu>
diff --git a/linden/indra/newview/skins/default/xui/es/strings.xml b/linden/indra/newview/skins/default/xui/es/strings.xml
index 8cd1891..0daa11a 100644
--- a/linden/indra/newview/skins/default/xui/es/strings.xml
+++ b/linden/indra/newview/skins/default/xui/es/strings.xml
@@ -480,7 +480,7 @@
        <string name="xml_file">
                Archivo XML
        </string>
-        <string name="dot_raw_file">
+        <string name="raw_file">
                Archivo RAW
        </string>
        <string name="compressed_image_files">
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml
index 926483b..89b6cb2 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml
@@ -33,6 +33,9 @@
        <string name="unavailable_text_label">
                Le chat écrit n&apos;est pas disponible pour cet appel.
        </string>
+        <string name="add_friend_string">
+                Devenir amis
+        </string>
        <flyout_button label="Profil..." name="profile_callee_btn"/>
        <button label="Appeler" name="start_call_btn"/>
        <button label="Raccrocher" name="end_call_btn"/>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_tools.xml b/linden/indra/newview/skins/default/xui/fr/floater_tools.xml
index c89939f..38b137c 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_tools.xml
@@ -122,8 +122,11 @@
                                Transférer
                        </string>
                        <button label="Céder..." label_selected="Céder..." name="button deed" tool_tip="Les objets partagés par un groupe peuvent être cédés par un officier."/>
-                        <check_box label="Autoriser tout le monde à déplacer" name="checkbox allow everyone move"/>
+                        <text name="Anyone can:">
-                        <check_box label="Autoriser tout le monde à copier" name="checkbox allow everyone copy"/>
+                                N&apos;importe qui :
+                        </text>
+                        <check_box label="Bouger" name="checkbox allow everyone move"/>
+                        <check_box label="Copier" name="checkbox allow everyone copy"/>
                        <check_box label="Afficher dans la recherche" name="search_check" tool_tip="Afficher l&apos;objet dans les résultats de recherche"/>
                        <check_box label="À vendre" name="checkbox for sale"/>
                        <text name="Cost">
diff --git a/linden/indra/newview/skins/default/xui/fr/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/fr/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/fr/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</menu>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml
index 0c30199..4f33ae4 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml
@@ -1,4 +1,183 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="advanced_panel">
+<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-        <check_box label="Partager la langue avec les objets" name="language_is_public" tool_tip="Cette option permet de faire connaître aux objets du Monde votre langue favorite."/>
+     height="408" label="Avancé" left="102" mouse_opaque="true"
-</panel>
+     name="advanced_panel" width="517">
+  <!-- Start organizing these when we get enough of 'em - MC -->
+  <tab_container label="Page 2" bottom="0" height="450" left="0" mouse_opaque="false"
+   name="tab2" tab_min_width="50" tab_position="top" width="495" bg_opaque_color="0,0,0,0.0">
+    
+    <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
+     height="408" label="Main" left="102" mouse_opaque="true"
+     name="main_panel" width="517">
+      <check_box label="Désactiver l'écrant de Connexion/Déconnexion" name="disable_log_screen_check" />
+      <check_box label="Désactiver l'écrant de téléportation" name="disable_tp_screen_check" />
+      <check_box label="Afficher les noms de clients dans les titres" name="client_name_tag_check"/>
+      <check_box label="Afficher les noms de clients avec la couleur" name="client_name_color_check"/>
+      <check_box label="Afficher les noms de clients dans les infos-bulles" name="client_name_hover_check" />
+      <check_box label="Afficher le nom de votre clien pour les residents" name="client_name_tag_broadcast_check" radio_style="false" width="217" />
+      <check_box label="Activer les Ombres (ATTENTION: instable et les graphiques Ultra sont requis)" name="shadows_check"/>
+      <text bottom_delta="-25" left="16" height="15" width="300"
+           follows="top|left">
+          Laisser la région gèrer le WindLight (LightShare):
+      </text>
+      <combo_box name="lightshare_combo"
+                 bottom_delta="-2" left_delta="250" height="18" width="135"
+                 allow_text_entry="false" follows="left|top">
+        <combo_item type="string" name="never" value="0">
+          Jamais
+        </combo_item>
+        <combo_item type="string" name="ask" value="1">
+          Toujours me le demander
+        </combo_item>
+        <combo_item type="string" name="always" value="2">
+          Toujours
+        </combo_item>
+      </combo_box>
+      <check_box label="Utiliser le raffraichissement de texture HTTP (experimental)" name="http_texture_check" />
+      <check_box label="Augmenter la vitesse de rez par une vue moins progressive" name="speed_rez_check"/>
+      <spinner label="Intervalle de chaque étapes:" name="speed_rez_interval_spinner" />
+      <text bottom_delta="0" follows="top|left" height="15" left_delta="150"
+                 name="speed_rez_seconds_text" width="115">
+        secondes
+      </text>
+      <check_box label="Animer votre avatar quand vous êtes en mode apparence" name="appearance_anim_check"/>
+      <check_box label="Utiliser l'ancien menu de sélection" name="legacy_pie_menu_checkbox"/>
+      <check_box label="Partager la langue de votre client avec l'objet" name="language_is_public"/>
+      <check_box bottom_delta="-25" enabled="true"
+           follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+           initial_value="false" label="Use MU* pose style chat and IM" left="12"
+           mouse_opaque="true" name="allow_mupose"
+           radio_style="false" tool_tip="Use MU* pose style in chat and IM (with ':' as a synonymous to '/me ')."
+           width="256" />
+      <check_box bottom_delta="0" enabled="true"
+           follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+           initial_value="false" label="Auto-close OOC (( )) chat" left_delta="250"
+           mouse_opaque="true" name="auto_close_ooc"
+           radio_style="false" tool_tip="Auto-close OOC chat (i.e. add )) if not found and (( was used)."
+           width="256" />
+      <check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+           initial_value="false" label="Use the chatbar as a command line" left="12"
+           mouse_opaque="true" name="command_line_check" radio_style="false" width="270"/>
+      <button bottom_delta="-20" follows="left|top" font="SansSerif" height="20" width="150"
+           label="Chatbar Commands" name="command_line_btn" left="12"
+           tool_tip="Set specific chatbar command line commands here" />
+  <!-- Uncomment when we start using the crash logger - MC -->
+  <!--<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="18" left="12"
+       mouse_opaque="true" name="crash_report_textbox" v_pad="0" width="394">
+    Crash reports:
+  </text>
+  <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="crash_behavior_combobox" width="146">
+    <combo_item type="string" length="1" enabled="true" name="Askbeforesending" value="Ask before sending">
+      Ask before sending
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Alwayssend" value="Always send">
+      Always send
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Neversend" value="Never send">
+      Never send
+    </combo_item>
+  </combo_box>-->
+    <button bottom="10" follows="left|bottom" font="SansSerif" height="20" width="250" 
+           label="Reset All Preferences To Default" name="reset_btn" left="12" 
+           tool_tip="Reset all preferences to their default values (requires a restart)" />
+    </panel>
+    
+    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="SpellCheck"
+       left="1" mouse_opaque="true" name="SpellCheck" width="418">
+      <button bottom="-25" follows="left|top" font="SansSerifSmall" height="18" label="?"
+         name="EmeraldHelp_SpellCheck" tool_tip="Click here for help regarding the settings in this page."
+         right="490" width="18"/>
+      <check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+         label="Show misspelled words in red" left="12" mouse_opaque="true" name="EmeraldSpellDisplay"
+         control_name="EmeraldSpellDisplay" width="126"/>
+      <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left="12"
+         name="EmSpell_txt1" width="512">
+        Current language (dictionary):
+      </text>
+      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="18"
+         max_chars="200" mouse_opaque="true" name="EmeraldSpellBase" width="250"
+         control_name="EmeraldSpellBase" tool_tip=""/>
+      <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left="12"
+         name="EmSpell_txt3" width="512">
+        Downloaded languages (dictionaries):
+      </text>
+      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="18"
+         max_chars="200" mouse_opaque="true" name="EmSpell_Avail" width="250"
+         control_name="EmSpell_Avail" tool_tip=""/>
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Install"
+         name="EmSpell_Add" tool_tip="" left_delta="255" width="80"/>
+      <button bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20" label="Download More..."
+         name="EmSpell_GetMore" tool_tip="Get more dictionaries availabe online" left="12" width="250"/>
+      <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left="12"
+         name="EmSpell_txt2" width="512">
+        Additional custom languages (dictionaries):
+      </text>
+      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="18"
+         max_chars="200" mouse_opaque="true" name="EmSpell_Installed" width="250"
+         control_name="EmSpell_Installed" tool_tip=""/>
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Remove"
+         name="EmSpell_Remove" tool_tip="" left_delta="255" width="80"/>
+      <!--<button bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="18" label="Edit Custom dictionary"
+         name="EmSpell_EditCustom" tool_tip="" left_delta="20" width="130"/>-->
+      <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left="12"
+         name="EmSpell_txt4" width="512">
+To use spellcheck, right-click a misspelled word
+(red or otherwise) and select its replacement
+      </text>
+      <button name="ac_button" label="AutoCorrect Options..." halign="center"
+         tool_tip="Modify the AutoCorrect word list and settings" left="12"
+         bottom_delta="-50" width="180" height="20" font="SansSerifSmall" follows="left|top"/>
+    </panel>
+    
+    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Extra" 
+    left="1" mouse_opaque="true" name="Extra" width="418">
+        <check_box bottom_delta="-30" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+            initial_value="true" label="Show chat messages from friends in a different color" left="12"
+            mouse_opaque="true" name="HighlightFriendsChat" radio_style="false" width="270"/>
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-100"
+            can_apply_immediately="true" color="1 1 1 1" control_name="FriendsChatColor"
+            enabled="true" follows="left|top" height="67" label="Friends" left_delta="68"
+            mouse_opaque="true" name="FriendsChatColor" width="65" />
+        <check_box bottom_delta="-30" enabled="true" follows="left|top"
+                 font="SansSerifSmall" height="16" initial_value="true"
+                 label="Show chat messages containing your name in a different color" left="12" mouse_opaque="true"
+                 name="HighlightOwnNameInChat" radio_style="false" width="217" />
+                <check_box bottom_delta="-30" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+            initial_value="true" label="Show GroupIM messages containing your name in a different color" left="12"
+            mouse_opaque="true" name="HighlightOwnNameInIM" radio_style="false" width="270"/>
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-230"
+            can_apply_immediately="true" color="1 1 1 1" control_name="OwnNameChatColor"
+            enabled="true" follows="left|top" height="67" label="Own Name" left_delta="68"
+            mouse_opaque="true" name="OwnNameChatColor" width="65" />
+                <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-50"
+                        enabled="true" follows="left|top" font="SansSerif"
+                        handle_edit_keys_directly="true" height="20" left_delta="0"
+                        max_length="50" mouse_opaque="true" name="nick01"
+                        select_all_on_focus_received="true" width="400" word_wrap="false" />
+                <text bottom_delta="-3" follows="left|top" font="SansSerifSmall" height="20" left="20" name="nick01_text" width="70">Nick 1</text>
+                <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-30"
+                        enabled="true" follows="left|top" font="SansSerif"
+                        handle_edit_keys_directly="true" height="20" left_delta="60"
+                        max_length="50" mouse_opaque="true" name="nick02"
+                        select_all_on_focus_received="true" width="400" word_wrap="false" />
+                <text bottom_delta="-3" follows="left|top" font="SansSerifSmall" height="20" left="20" name="nick02_text" width="70">Nick 2</text>
+                <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-30"
+                        enabled="true" follows="left|top" font="SansSerif"
+                        handle_edit_keys_directly="true" height="20" left_delta="60"
+                        max_length="50" mouse_opaque="true" name="nick03"
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/fr/panel_preferences_audio.xml
index 78475bd..d4574d1 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_preferences_audio.xml
@@ -15,6 +15,7 @@
        <check_box label="Couper le son lorsque la fenêtre est minimisée" name="mute_when_minimized"/>
        <check_box bottom="-200" height="32" label="Jouer la musique disponible &#10;
 (consommateur en bande passante)" name="streaming_music"/>
+  <check_box bottom_delta="-30" label="Afficher le titre de la chanson" name="show_stream_title"/>
        <check_box bottom_delta="-32" height="32" label="Jouer le média disponible &#10;
 (consommateur en bande passante)" name="streaming_video"/>
        <check_box bottom_delta="-32" label="Lire automatiquement le média" name="auto_streaming_video"/>
@@ -22,5 +23,6 @@
        <slider label="Facteur d&apos;éloignement" label_width="115" name="Distance Factor"/>
        <slider label="Facteur d&apos;atténuation" label_width="115" name="Rolloff Factor"/>
        <spinner label="Alerte L$" name="L$ Change Threshold"/>
-        <spinner label="Alerte santé" name="Health Change Threshold"/>
+        <spinner label="Alerte santé" name="Health change threshold"/>
+  <check_box label="Desactiver le bruit du vent" name="mute_wind_check"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/fr/panel_preferences_im.xml
index 2e7efd3..af5f846 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_preferences_im.xml
@@ -8,9 +8,17 @@
                se connecter pour changer
        </text>
        <check_box label="Envoyer les IM à mon adresse e-mail ([EMAIL])" name="send_im_to_email"/>
-        <check_box label="Afficher les IM dans la console du chat" name="include_im_in_chat_console"/>
+        <check_box bottom="-90" label="La console chat" name="include_im_in_chat_console" left="160"/>
-        <check_box label="Afficher l&apos;heure dans les IM" name="show_timestamps_check"/>
+        <check_box bottom="-90" label="La fenêtre communiquer" name="include_im_in_chat_history" left="260" />
-        <check_box label="Me prévenir quand des amis se connectent" name="friends_online_notify_checkbox"/>
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-60" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="160"
+             mouse_opaque="false" name="show_ims_label" v_pad="0" width="100">
+    Afficher les IMs dans:
+  </text>
+        <check_box bottom="-120" label="Afficher l&apos;heure dans les IM" name="show_timestamps_check"/>
+        <check_box bottom="-140" label="Me prévenir quand des amis se connectent" name="friends_online_notify_checkbox"/>
+        <check_box label="Afficher les IMs verticalement (redémarrage requis)" name="vertical-imtabs-toggle"/>
        <text name="text_box3">
                Réponse si occupé(e) :
        </text>
@@ -24,8 +32,8 @@
        <check_box label="Inclure les heures" name="log_chat_timestamp"/>
        <check_box label="Inclure les IM reçus" name="log_chat_IM"/>
        <check_box label="Inclure la date avec les heures" name="log_date_timestamp"/>
-        <button label="Changer d&apos;emplacement" label_selected="Changer d&apos;emplacement" name="log_path_button" width="150"/>
+        <button label="Changer d&apos;emplacement" label_selected="Changer d&apos;emplacement" name="log_path_button" left="145" width="170"/>
-        <line_editor left="308" name="log_path_string" right="-20"/>
+        <line_editor left="320" name="log_path_string" right="-20"/>
        <text length="1" name="text_box2" type="string">
                IM :
        </text>
diff --git a/linden/indra/newview/skins/default/xui/fr/strings.xml b/linden/indra/newview/skins/default/xui/fr/strings.xml
index 61615b1..a73db59 100644
--- a/linden/indra/newview/skins/default/xui/fr/strings.xml
+++ b/linden/indra/newview/skins/default/xui/fr/strings.xml
@@ -484,7 +484,7 @@
        <string name="xml_file">
                Fichier XML
        </string>
-        <string name="dot_raw_file">
+        <string name="raw_file">
                Fichier RAW
        </string>
        <string name="compressed_image_files">
diff --git a/linden/indra/newview/skins/default/xui/hu/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/hu/floater_instant_message.xml
index 3469323..09c7af6 100644
--- a/linden/indra/newview/skins/default/xui/hu/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/hu/floater_instant_message.xml
@@ -33,6 +33,9 @@
        <string name="unavailable_text_label">
                Szöveges üzenetküldés nem elérhető a jelenlegi hívás alatt.
        </string>
+        <string name="add_friend_string">
+                Barátokhoz ad
+        </string>
        <flyout_button label="Adatlap" name="profile_callee_btn"/>
        <button label="Hívás" name="start_call_btn"/>
        <button label="Hívás vége" name="end_call_btn"/>
diff --git a/linden/indra/newview/skins/default/xui/hu/floater_tools.xml b/linden/indra/newview/skins/default/xui/hu/floater_tools.xml
index 35adb06..e146248 100644
--- a/linden/indra/newview/skins/default/xui/hu/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/hu/floater_tools.xml
@@ -122,8 +122,8 @@
                                Átruház
                        </string>
                        <button label="Átruház" label_selected="Átruház" name="button deed" tool_tip="Csoporttal megosztott tárgyakat a csoport vezetője törölni tudja."/>
-                        <check_box label="Bárki mozgathatja" name="checkbox allow everyone move"/>
+                        <check_box label="Mozgathatja" name="checkbox allow everyone move"/>
-                        <check_box label="Bárki másolhatja" name="checkbox allow everyone copy"/>
+                        <check_box label="Másolás" name="checkbox allow everyone copy"/>
                        <check_box label="Keresőben megjelenít" name="search_check" tool_tip="A tárgy megjelenítése a keresési eredmények között"/>
                        <check_box label="Eladó" name="checkbox for sale"/>
                        <text name="Cost">
diff --git a/linden/indra/newview/skins/default/xui/hu/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/hu/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/hu/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</menu>
diff --git a/linden/indra/newview/skins/default/xui/hu/strings.xml b/linden/indra/newview/skins/default/xui/hu/strings.xml
index 730fa28..8e1dc3b 100644
--- a/linden/indra/newview/skins/default/xui/hu/strings.xml
+++ b/linden/indra/newview/skins/default/xui/hu/strings.xml
@@ -480,7 +480,7 @@
        <string name="xml_file">
                XML fájl
        </string>
-        <string name="dot_raw_file">
+        <string name="raw_file">
                RAW fájl
        </string>
        <string name="compressed_image_files">
diff --git a/linden/indra/newview/skins/default/xui/it/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/it/floater_instant_message.xml
index 7bdc046..511dac5 100644
--- a/linden/indra/newview/skins/default/xui/it/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/it/floater_instant_message.xml
@@ -33,6 +33,9 @@
        <string name="unavailable_text_label">
                La chat di testo non è disponibile in questa chiamata.
        </string>
+        <string name="add_friend_string">
+                Aggiungi come amico
+        </string>
        <flyout_button label="Profilo..." name="profile_callee_btn"/>
        <button label="Chiama" name="start_call_btn"/>
        <button label="Termina" name="end_call_btn"/>
diff --git a/linden/indra/newview/skins/default/xui/it/floater_tools.xml b/linden/indra/newview/skins/default/xui/it/floater_tools.xml
index c7c5890..1a8c06d 100644
--- a/linden/indra/newview/skins/default/xui/it/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/it/floater_tools.xml
@@ -123,8 +123,11 @@
                                Cedi al gruppo
                        </string>
                        <button left_delta="152" width="98" label="Cedi al gruppo..." label_selected="Cedi al gruppo..." name="button deed" tool_tip="Gli oggetti condivisi con il gruppo possono essere ceduti da un funzionario del gruppo."/>
-                        <check_box label="Permetti a chiunque di spostare" name="checkbox allow everyone move"/>
+                        <text name="Anyone can:">
-                        <check_box label="Permetti a chiunque di copiare" name="checkbox allow everyone copy"/>
+                                Chiunque:
+                        </text>
+                        <check_box label="Sposta" name="checkbox allow everyone move"/>
+                        <check_box label="Copia" name="checkbox allow everyone copy"/>
                        <check_box label="Mostra nella ricerca" name="search_check" tool_tip="Permetti che l&apos;oggetto sia visibile nella ricerca"/>
                        <check_box label="In vendita" name="checkbox for sale"/>
                        <text name="Cost">
diff --git a/linden/indra/newview/skins/default/xui/it/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/it/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/it/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</menu>
diff --git a/linden/indra/newview/skins/default/xui/it/strings.xml b/linden/indra/newview/skins/default/xui/it/strings.xml
index 7089a93..1753f80 100644
--- a/linden/indra/newview/skins/default/xui/it/strings.xml
+++ b/linden/indra/newview/skins/default/xui/it/strings.xml
@@ -480,7 +480,7 @@
        <string name="xml_file">
                File XML
        </string>
-        <string name="dot_raw_file">
+        <string name="raw_file">
                File RAW
        </string>
        <string name="compressed_image_files">
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml
index c9de54e..8bba7e3 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml
@@ -33,6 +33,9 @@
        <string name="unavailable_text_label">
                このコールでは文字チャットが利用できません。
        </string>
+        <string name="add_friend_string">
+                フレンドに追加
+        </string>
        <flyout_button label="プロフィール" name="profile_callee_btn" width="100"/>
        <button label="コール" left_delta="105" name="start_call_btn" width="100"/>
        <button label="呼出終了" name="end_call_btn" width="100"/>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_tools.xml b/linden/indra/newview/skins/default/xui/ja/floater_tools.xml
index 81f221a..738f00b 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_tools.xml
@@ -122,8 +122,11 @@
                                譲渡
                        </string>
                        <button label="譲渡..." label_selected="譲渡..." name="button deed" tool_tip="グループ共有のオブジェクトは、グループ・オフィサーにより譲渡可能です。"/>
-                        <check_box label="誰に対しても移動を許可" name="checkbox allow everyone move"/>
+                        <text name="Anyone can:">
-                        <check_box label="誰に対してもコピーを許可" name="checkbox allow everyone copy"/>
+                                全員：
+                        </text>
+                        <check_box label="移動" name="checkbox allow everyone move"/>
+                        <check_box label="コピー" name="checkbox allow everyone copy"/>
                        <check_box label="検索に表示" name="search_check" tool_tip="検索結果で、このオブジェクトを人に見せる"/>
                        <check_box label="売り出し中" name="checkbox for sale"/>
                        <text name="Cost">
diff --git a/linden/indra/newview/skins/default/xui/ja/menu_mini_map.xml b/linden/indra/newview/skins/default/xui/ja/menu_mini_map.xml
index c8828a5..bdd63e8 100644
--- a/linden/indra/newview/skins/default/xui/ja/menu_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/ja/menu_mini_map.xml
@@ -3,6 +3,9 @@
        <menu_item_call label="ズーム（近）" name="Zoom Close"/>
        <menu_item_call label="ズーム（中）" name="Zoom Medium"/>
        <menu_item_call label="ズーム（遠）" name="Zoom Far"/>
+        <menu_item_check label="カメラを中央に" name="Center on Camera"/>
+        <menu_item_check label="ミニマップを回転" name="Rotate Mini-Map"/>
+        <menu_itemcall label="世界地図を表示" name="Show Map"/>
        <menu_item_call label="追跡をやめる" name="Stop Tracking"/>
        <menu_item_call label="プロフィール..." name="Profile"/>
 </menu>
diff --git a/linden/indra/newview/skins/default/xui/ja/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/ja/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/ja/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</menu>
diff --git a/linden/indra/newview/skins/default/xui/ja/menu_viewer.xml b/linden/indra/newview/skins/default/xui/ja/menu_viewer.xml
index c69c2e3..bc263bb 100644
--- a/linden/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -1,26 +1,39 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar name="Main Menu">
+        <!-- ファイル -->
+        
        <menu label="ファイル" name="File">
                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
-                <menu label="アップロード" name="upload">
+                <menu label="アップロード" name="Upload">
-                        <menu_item_call label="画像 （L$[COST]）..." name="Upload Image"/>
+                        <menu_item_call label="画像 （[UPLOADFEE]）..." name="Upload Image"/>
-                        <menu_item_call label="サウンド （L$[COST]）..." name="Upload Sound"/>
+                        <menu_item_call label="サウンド （[UPLOADFEE]）..." name="Upload Sound"/>
-                        <menu_item_call label="アニメーション （L$[COST]）..." name="Upload Animation"/>
+                        <menu_item_call label="アニメーション （[UPLOADFEE]）..." name="Upload Animation"/>
-                        <menu_item_call label="一括 （ファイルにつきL$[COST]）..." name="Bulk Upload"/>
+                        <menu_item_call label="一括 （ファイルにつき[UPLOADFEE]）..." name="Bulk Upload"/>
                        <menu_item_separator label="-----------" name="separator"/>
                        <menu_item_call label="デフォルト権限の設定..." name="perm prefs"/>
                </menu>
                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_call label="オブジェクトのインポート..." name="Import"/>
+                <menu_item_call label="インポートとアップロード... (テクスチャにつき[UPLOADFEE])" name="ImportUpload"/>
+                <menu_item_call label="選択したオブジェクトのエクスポート..." name="Export"/>
+                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_call label="全てののウィンドウを最小化" name="Minimize All Windows"/>
                <menu_item_call label="ウィンドウを閉じる" name="Close Window"/>
                <menu_item_call label="全てのウィンドウを閉じる" name="Close All Windows"/>
-                <menu_item_separator label="-----------" name="separator2"/>
-                <menu_item_call label="テクスチャーを別名で保存..." name="Save Texture As..."/>
                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_call label="テクスチャーを別名で保存..." name="Save Texture As..."/>
+                <menu_item_separator label="-----------" name="separator4"/>
                <menu_item_call label="スナップショットを撮る" name="Take Snapshot"/>
                <menu_item_call label="スナップショットをディスクに保存" name="Snapshot to Disk"/>
-                <menu_item_separator label="-----------" name="separator4"/>
+                <menu_item_separator label="-----------" name="separator5"/>
                <menu_item_call label="終了" name="Quit"/>
        </menu>
+        
+        <!--  編集 -->
+        
        <menu label="編集" name="Edit">
                <menu_item_call label="元に戻す" name="Undo"/>
                <menu_item_call label="やり直し" name="Redo"/>
@@ -51,16 +64,21 @@
                        <menu_item_call label="スカート" name="Skirt"/>
                        <menu_item_call label="すべての服" name="All Clothes"/>
                </menu>
+                <menu_item_call label="容姿の再描画" name="Refresh Appearance"/>
                <menu_item_separator label="-----------" name="separator6"/>
-                <menu_item_call label="ジェスチャー…" name="Gestures..."/>
+                <menu_item_call label="ジェスチャー" name="Gestures"/>
                <menu_item_call label="プロフィール..." name="Profile..."/>
                <menu_item_call label="容姿..." name="Appearance..."/>
                <menu_item_separator label="-----------" name="separator7"/>
-                <menu_item_check label="フレンド..." name="Friends..."/>
+                <menu_item_check label="フレンド" name="Friends"/>
-                <menu_item_call label="グループ..." name="Groups..."/>
+                <menu_item_call label="グループ" name="Groups"/>
                <menu_item_separator label="-----------" name="separator8"/>
                <menu_item_call label="環境設定..." name="Preferences..."/>
        </menu>
+        <!-- 表示 -->
+        
        <menu label="表示" name="View">
                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
                <menu_item_call label="一人称視点（マウスルック）" name="Mouselook"/>
@@ -69,23 +87,27 @@
                <menu_item_call label="表示をリセット" name="Reset View"/>
                <menu_item_call label="最後のチャットを閲覧" name="Look at Last Chatter"/>
                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_call label="ウェブ・ブラウザ" name="Web Browser"/>
+                <menu_item_separator label="-----------" name="separator2"/>
                <menu_item_check label="ツールバー" name="Toolbar"/>
                <menu_item_check label="ローカル・チャット" name="Chat History"/>
                <menu_item_check label="コミュニケーション" name="Instant Message"/>
                <menu_item_check label="持ち物" name="Inventory"/>
                <menu_item_check label="ボイスチャット・ユーザー一覧" name="Active Speakers"/>
                <menu_item_check label="無視リスト" name="Mute List"/>
-                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_separator label="-----------" name="separator3"/>
                <menu_item_check label="カメラ・コントロール" name="Camera Controls"/>
                <menu_item_check label="移動コントロール" name="Movement Controls"/>
                <menu_item_check label="世界地図" name="World Map"/>
                <menu_item_check label="ミニマップ" name="Mini-Map"/>
-                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_separator label="-----------" name="separator4"/>
+                <menu_item_call label="AO" name="AO"/>
+                <menu_item_separator label="-----------" name="separator5"/>
                <menu_item_check label="地域の統計情報" name="Statistics Bar"/>
                <menu_item_check label="土地の境界線" name="Property Lines"/>
                <menu_item_check label="立入禁止ライン" name="Banlines"/>
                <menu_item_check label="土地オーナー" name="Land Owners"/>
-                <menu_item_separator label="-----------" name="separator4"/>
+                <menu_item_separator label="-----------" name="separator6"/>
                <menu label="ヒントのポップアップ" name="Hover Tips">
                        <menu_item_check label="ヒントを表示" name="Show Tips"/>
                        <menu_item_separator label="-----------" name="separator"/>
@@ -96,14 +118,21 @@
                <menu_item_check label="ビーコン(標識)" name="beacons"/>
                <menu_item_check label="パーティクルを非表示" name="Hide Particles"/>
                <menu_item_check label="HUD装着物を表示" name="Show HUD Attachments"/>
-                <menu_item_separator label="-----------" name="separator5"/>
+                <menu_item_separator label="-----------" name="separator7"/>
-                <menu_item_call label="カメラ・ズームイン" name="Zoom In"/>
+                <menu label="ズーム" name="Zoom Level">
-                <menu_item_call label="カメラ・デフォルト" name="Zoom Default"/>
+                        <menu_item_call label="カメラ・ズームイン" name="Zoom In"/>
-                <menu_item_call label="カメラ・ズームアウト" name="Zoom Out"/>
+                        <menu_item_call label="カメラ・デフォルト" name="Zoom Default"/>
-                <menu_item_separator label="-----------" name="separator6"/>
+                        <menu_item_call label="カメラ・ズームアウト" name="Zoom Out"/>
+                </menu>
                <menu_item_call label="[全画面表示]" name="Toggle Fullscreen"/>
                <menu_item_call label="UIサイズを標準設定に戻す" name="Set UI Size to Default"/>
+                <menu_item_separator label="-----------" name="separator8"/>
+                <menu_item_check label="アドバンスメニューを表示" name="Toggle Advanced Menu"/>
        </menu>
+        <!-- 世界 -->
+        
        <menu label="世界" name="World">
                <menu_item_call label="チャット" name="Chat"/>
                <menu_item_check label="常に走る" name="Always Run"/>
@@ -116,9 +145,11 @@
                <menu_item_separator label="-----------" name="separator3"/>
                <menu_item_call label="離席中に設定" name="Set Away"/>
                <menu_item_call label="取り込み中に設定" name="Set Busy"/>
+                <menu_item_call label="IMに自動応答する" name="Auto-Respond to IMs"/>
+                <menu_item_separator label="-----------" name="separator4"/>
                <menu_item_call label="自分のアバターのアニメーションを停止" name="Stop Animating My Avatar"/>
                <menu_item_call label="キー制御を解除" name="Release Keys"/>
-                <menu_item_separator label="-----------" name="separator4"/>
+                <menu_item_separator label="-----------" name="separator5"/>
                <menu_item_call label="アカウントの履歴..." name="Account History...">
                        <on_click name="AccountHistory_url" userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php?lang=ja"/>
                </menu_item_call>
@@ -126,12 +157,12 @@
                        <on_click name="ManageMyAccount_url" userdata="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=ja"/>
                </menu_item_call>
                <menu_item_call label="L$（リンデン・ドル）を購入" name="Buy and Sell L$..."/>
-                <menu_item_separator label="-----------" name="separator5"/>
-                <menu_item_call label="自分の土地..." name="My Land..."/>
-                <menu_item_call label="土地情報..." name="About Land..."/>
-                <menu_item_call label="土地を購入..." name="Buy Land..."/>
-                <menu_item_call label="地域／不動産..." name="Region/Estate..."/>
                <menu_item_separator label="-----------" name="separator6"/>
+                <menu_item_call label="自分の土地" name="My Land"/>
+                <menu_item_call label="土地情報" name="About Land"/>
+                <menu_item_call label="土地を購入..." name="Buy Land..."/>
+                <menu_item_call label="地域／不動産" name="Region/Estate"/>
+                <menu_item_separator label="-----------" name="separator7"/>
                <menu label="環境の設定" name="Environment Settings">
                        <menu_item_call label="日の出" name="Sunrise"/>
                        <menu_item_call label="正午" name="Noon"/>
@@ -142,6 +173,10 @@
                        <menu_item_call label="環境編集" name="Environment Editor"/>
                </menu>
        </menu>
+        <!-- ツール -->
+        
        <menu label="ツール" name="Tools">
                <menu label="ツールを選ぶ" name="Select Tool">
                        <menu_item_call label="フォーカス" name="Focus"/>
@@ -151,28 +186,43 @@
                        <menu_item_call label="土地" name="Land"/>
                </menu>
                <menu_item_separator label="-----------" name="separator"/>
-                <menu_item_check label="自分のオブジェクトのみ選択" name="Select Only My Objects"/>
+                <menu_item_call label="選択対象に視点移動" name="Focus on Selection"/>
-                <menu_item_check label="移動可能なオブジェクトのみ選択" name="Select Only Movable Objects"/>
+                <menu_item_call label="選択範囲にズームイン" name="Zoom to Selection"/>
-                <menu_item_check label="環境で選択" name="Select By Surrounding"/>
+                <menu label="選択オプション" name="Selection Options">
-                <menu_item_check label="隠れた位置の選択も表示" name="Show Hidden Selection"/>
+                        <menu_item_check label="自分のオブジェクトのみ選択" name="Select Only My Objects"/>
-                <menu_item_check label="選択したものの光源範囲を表示" name="Show Light Radius for Selection"/>
+                        <menu_item_check label="移動可能なオブジェクトのみ選択" name="Select Only Movable Objects"/>
-                <menu_item_check label="選択ビームを表示" name="Show Selection Beam"/>
+                        <menu_item_check label="コピー可能なオブジェクトのみ選択" name="Select Only Copyable Objects"/>
+                        <menu_item_check label="環境で選択" name="Select By Surrounding"/>
+                        <menu_item_separator label="-----------" name="separator"/>
+                        <menu_item_check label="隠れた位置の選択も表示" name="Show Hidden Selection"/>
+                        <menu_item_check label="選択したものの光源範囲を表示" name="Show Light Radius for Selection"/>
+                        <menu_item_check label="選択したものの輪郭を表示" name="Show Selection Outlines"/>
+                        <menu_item_check label="選択ビームを表示" name="Show Selection Beam"/>
+                </menu>
                <menu_item_separator label="-----------" name="separator2"/>
                <menu_item_check label="グリッドにスナップ" name="Snap to Grid"/>
                <menu_item_call label="オブジェクトのXY移動をグリッドに合わせる" name="Snap Object XY to Grid"/>
                <menu_item_call label="グリッドをオブジェクトの位置基準で再設定" name="Use Selection for Grid"/>
                <menu_item_call label="グリッドのオプション..." name="Grid Options..."/>
+                <menu_item_call label="高度な制作オプション" name="Advanced Build Options..."/>
                <menu_item_separator label="-----------" name="separator3"/>
                <menu_item_check label="リンクされた一部を編集" name="Edit Linked Parts"/>
+                <menu label="リンクした部分を選択する" name="Select Linked Parts">
+                        <menu_item_call label="次の部分を選択する" name="Select Next Part"/>
+                        <menu_item_call label="前回の部分を選択する" name="Select Previous Part"/>
+                        <menu_item_call label="次の部分を含める" name="Include Next Part"/>
+                        <menu_item_call label="前回の部分を含める" name="Include Previous Part"/>
+                </menu>
                <menu_item_call label="リンク" name="Link"/>
                <menu_item_call label="リンク解除" name="Unlink"/>
                <menu_item_separator label="-----------" name="separator4"/>
-                <menu_item_call label="選択対象に視点移動" name="Focus on Selection"/>
+                <menu_item_call label="複製" name="Duplicate"/>
-                <menu_item_call label="選択範囲にズームイン" name="Zoom to Selection"/>
                <menu_item_call label="オブジェクトを購入" name="Menu Object Take">
                        <on_enable userdata="購入,取る" name="EnableBuyOrTake"/>
                </menu_item_call>
                <menu_item_call label="コピーを取る" name="Take Copy"/>
+                <menu_item_separator label="-----------" name="separator5"/>
+                <menu_item_call label="オブジェクトを返却" name="Return..."/>
                <menu_item_call label="オブジェクトをオブジェクト・コンテンツに戻して保存" name="Save Object Back to Object Contents"/>
                <menu_item_separator label="-----------" name="separator6"/>
                <menu_item_call label="スクリプト警告／エラー・ウィンドウを表示" name="Show Script Warning/Error Window"/>
@@ -183,37 +233,274 @@
                <menu_item_call label="選択したオブジェクトの中のスクリプトをリセット" name="Reset Scripts in Selection"/>
                <menu_item_call label="選択したオブジェクトの中のスクリプトを起動する" name="Set Scripts to Running in Selection"/>
                <menu_item_call label="選択したオブジェクトの中のスクリプトを停止する" name="Set Scripts to Not Running in Selection"/>
+                <menu_item_separator label="-----------" name="separator7"/>
+                <menu_item_call label="一括権限設定" name="Set permissions on selected task inventory"/>
        </menu>
+        <!-- ヘルプ -->
+        
        <menu label="ヘルプ" name="Help">
-                <menu_item_call label="Second Life ヘルプ" name="Second Life Help"/>
+                <menu_item_call label="ヘルプ" name="Grid Help"/>
                <menu_item_call label="チュートリアル" name="Tutorial"/>
                <menu_item_separator label="-----------" name="separator"/>
-                <menu_item_call label="Linden公式ブログ..." name="Official Linden Blog..."/>
+                <menu_item_call label="Imprudenceブログ" name="Imprudence Blog"/>
+                <menu_item_call label="Imprudenceフォーラム" name="Imprudence Forums"/>
                <menu_item_separator label="-----------" name="separator2"/>
-                <menu_item_call label="スクリプト・ポータル..." name="Scripting Portal...">
+                <menu_item_call label="スクリプト・ポータル" name="Scripting Portal">
                        <on_click name="ScriptingPortal_url" userdata="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal/ja" />
                </menu_item_call>
                <menu_item_separator label="-----------" name="separator3"/>
                <menu_item_call label="嫌がらせの報告..." name="Report Abuse..."/>
-                <menu_item_call label="衝突の記録..." name="Bumps, Pushes &amp;amp; Hits..."/>
+                <menu_item_call label="衝突の記録" name="Bumps, Pushes &amp;amp; Hits"/>
                <menu_item_call label="ラグ メーター" name="Lag Meter"/>
-                <menu_item_separator label="-----------" name="separator7"/>
+                <menu_item_separator label="-----------" name="separator4"/>
-                <menu label="バグの報告" name="Bug Reporting">
+                <menu_item_call label="Imprudenceについて" name="About Imprudence"/>
-                        <menu_item_call label="パブリック問題トラッカー..." name="Public Issue Tracker..."/>
+        </menu>
-                        <menu_item_call label="パブリック問題トラッカー ヘルプ..." name="Publc Issue Tracker Help...">
-                                <on_click name="PublicIssueTrackerHelp_url" userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker/ja" />
-                        </menu_item_call>
+        <!-- アドバンス-->
-                        <menu_item_separator label="-----------" name="separator7"/>
+        
-                        <menu_item_call label="バグの報告 101..." name="Bug Reporing 101...">
+        <menu label="アドバンス" name="Advanced" drop_shadow="true">
-                                <on_click name="BugReporting101_url" userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101"/>
+                <menu label="コンソール" name="Consoles">
-                        </menu_item_call>
+                        <menu_item_check label="フレームのコンソール" name="Frame Console"/>
-                        <menu_item_call label="セキュリティ問題..." name="Security Issues...">
+                        <menu_item_check label="テクスチャのコンソール" name="Texture Console"/>
-                                <on_click name="SecurityIssues_url" userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues/ja"/>
+                        <menu_item_check label="デバッグコンソール" name="Debug Console"/>
-                        </menu_item_call>
+                        <menu_item_check label="ファーストタイマー" name="Fast Timers"/>
-                        <menu_item_call label="品質保証関連Wiki..." name="QA Wiki..."/>
+                        <menu_item_separator label="-----------" name="separator"/>                                     <menu_item_call label="通知コンソール" name="Notifications Console"/>
-                        <menu_item_separator label="-----------" name="separator9"/>
+                        <menu_item_separator label="-----------" name="separator2"/>                            <menu_item_call label="リージョン情報をデバッグコンソールへ" name="Region Info to Debug Console"/>
-                        <menu_item_call label="バグの報告..." name="Report Bug..."/>
+                        <menu_item_call label="グループ情報をデバッグコンソールへ" name="Group Info to Debug Console"/>
-                </menu>
+                        <menu_item_call label="性能情報をデバッグコンソールへ" name="Capabilities Info to Debug Console"/>
-                <menu_item_call label="Second Lifeについて" name="About Second Life..."/>
+                </menu>
+                <menu label="HUD情報" name="HUD Info">
+                        <menu_item_check label="速度" name="Velocity"/>
+                        <menu_item_check label="カメラ" name="Camera"/>
+                        <menu_item_check label="風" name="Wind"/>
+                        <menu_item_check label="FOV (視野角)" name="FOV"/>
+                </menu>
+                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_call label="ここにすわる" name="Ground Sit"/>
+                <menu_item_call label="地上にテレポート" name="Teleport to Ground"/>
+                <menu_item_check label="アバターをファントムにする" name="Phantom"/>
+                <menu_item_check label="アニメーション・リスト" name="Animation List"/>
+                <menu_item_check label="このエリアのオブジェクトを検索" name="Area Object Search"/>
+                <menu_item_check label="テクスチャ・ブラウザ" name="asset browser"/>
+                <menu_item_separator label="-----------" name="separator2"/>
+                <menu label="レンダリング" name="Rendering">
+                        <menu label="種類" name="Types">
+                                <menu_item_check label="シンプル" name="Simple"/>
+                                <menu_item_check label="アルファ" name="Alpha"/>
+                                <menu_item_check label="木" name="Tree"/>
+                                <menu_item_check label="アバター" name="Character"/>
+                                <menu_item_check label="地表" name="SurfacePatch"/>
+                                <menu_item_check label="空" name="Sky"/>
+                                <menu_item_check label="水" name="Water"/>
+                                <menu_item_check label="地面" name="Ground"/>
+                                <menu_item_check label="ボリューム" name="Volume"/>
+                                <menu_item_check label="草" name="Grass"/>
+                                <menu_item_check label="雲" name="Clouds"/>
+                                <menu_item_check label="パーティクル" name="Particles"/>
+                                <menu_item_check label="衝突" name="Bump"/>
+                        </menu>
+                        <menu label="機能" name="Features">
+                                <menu_item_check label="UI" name="UI"/>
+                                <menu_item_check label="選択済" name="Selected"/>
+                                <menu_item_check label="ハイライト" name="Highlighted"/>
+                                <menu_item_check label="ダイナミックテクスチャ" name="Dynamic Textures"/>
+                                <menu_item_check label="足の影" name="Foot Shadows"/>
+                                <menu_item_check label="くもり" name="Fog"/>
+                                <menu_item_check label="FRInfo のテスト" name="Test FRInfo"/>
+                                <menu_item_check label="フレキシブルオブジェクト" name="Flexible Objects"/>
+                        </menu>
+                        <menu label="情報を表示" name="Info Displays">
+                                <menu_item_check label="検証" name="Verify"/>
+                                <menu_item_check label="バウンディングボックス" name="BBoxes"/>
+                                <menu_item_check label="先端" name="Points"/>
+                                <menu_item_check label="オクトリー" name="Octree"/>
+                                <menu_item_check label="オクルージョン" name="Occlusion"/>
+                                <menu_item_check label="バッチの描画" name="Render Batches"/>
+                                <menu_item_check label="アニメーション・テクスチャ" name="Animated Textures"/>
+                                <menu_item_check label="テクスチャ優先度" name="Texture Priority"/>
+                                <menu_item_check label="アバターのレンダリングコストを表示する" name="Avatar Rendering Cost"/>
+                                <menu_item_check label="テクスチャの範囲" name="Texture Area (sqrt(A))"/>
+                                <menu_item_check label="側面" name="Face Area (sqrt(A))"/>
+                                <menu_item_check label="光" name="Lights"/>
+                                <menu_item_check label="パーティクル" name="Particles"/>
+                        </menu>
+                        <menu label="レンダーテスト" name="Render Tests">
+                                <menu_item_check label="カメラオフセット" name="Camera Offset"/>
+                                <menu_item_check label="フレームレートをランダム化" name="Randomize Framerate"/>
+                                <menu_item_check label="定期的に遅いフレームを挿入する" name="Periodic Slow Frame"/>
+                                <menu_item_check label="フレームテスト" name="Frame Test"/>
+                        </menu>
+                        <menu_item_separator label="-----------" name="separator"/>
+                        <menu_item_check label="軸" name="Axes"/>
+                        <menu_item_separator label="-----------" name="separator2"/>
+                        <menu_item_check label="選択したものを非表示にする" name="Hide Selected"/>
+                        <menu_item_separator label="-----------" name="separator3"/>
+                        <menu_item_check label="接線基底" name="Tangent Basis"/>
+                        <menu_item_call label="選択したテクスチャ情報" name="Selected Texture Info"/>
+                        <menu_item_check label="ワイヤーフレーム" name="Wireframe"/>
+                        <menu_item_check label="オブジェクト間オクルージョン" name="Object-Object Occlusion"/>
+                        <menu_item_check label="GL デバッグ" name="Debug GL"/>
+                        <menu_item_check label="経路をデバッグ" name="Debug Pipeline"/>
+                        <menu_item_check label="ファーストアルファ" name="Fast Alpha"/>
+                        <menu_item_check label="木のアニメーション" name="Animate Trees"/>
+                        <menu_item_check label="テクスチャのアニメーション" name="Animate Textures"/>
+                        <menu_item_check label="テクスチャを無効にする" name="Disable Textures"/>
+                        <menu_item_check label="マルチスレッド処理" name="Run Multiple Threads"/>
+                        <menu_item_check label="チージービーコン" name="Cheesy Beacon"/>
+                        <menu_item_check label="装着された光源を描画する" name="Attached Lights"/>
+                        <menu_item_check label="装着されたパーティクルを描画する" name="Attached Particles"/>
+                </menu>
+                <menu label="世界" name="World">
+                        <menu_item_check label="シムの太陽の設定を無視する" name="Sim Sun Override"/>
+                        <menu_item_call label="スクリプト付きカメラをダンプ" name="Dump Scripted Camera"/>
+                        <menu_item_check label="固定された天気" name="Fixed Weather"/>
+                        <menu_item_call label="リージョンオブジェクトのキャッシュをダンプする" name="Dump Region Object Cache"/>
+                </menu>
+                <menu label="RLVa" name="RLVa">
+                        <menu label="デバッグ" name="Debug">
+                                <menu_item_check label="デバッグ・メッセージを表示" name="Show Debug Messages"/>
+                                <menu_item_separator label="-----------" name="separator"/>
+                                <menu_item_check label="古い名称を有効にする" name="Enable Legacy Naming"/>
+                        </menu>
+                        <menu_item_separator label="-----------" name="separator"/>
+                        <menu_item_check label="装着を有効にする" name="Enable Wear"/>
+                        <menu_item_separator label="-----------" name="separator2"/>
+                        <menu_item_check label="ロックされたレイヤーを非表示" name="Hide locked layers"/>
+                        <menu_item_check label="ロックされたアタッチメントを非表示" name="Hide locked attachments"/>
+                        <menu_item_separator label="-----------" name="separator3"/>
+                        <menu_item_check label="#RLVフォルダの共有を禁止" name="Forbid Give to #RLV"/>
+                        <menu_item_check label="タグを表示" name="Show Name Tags"/>
+                        <menu_item_separator label="-----------" name="separator4"/>
+                        <menu_item_call label="制限..." name="Restrictions..."/>
+                </menu>
+                <menu label="UI" name="UI">
+                        <menu_item_check label="デフォルトのカラー・ピッカーを使用する" name="Use default system color picker"/>
+                        <menu_item_check label="メニュー・バーに検索ボックスを表示" name="Show search panel in overlay bar"/>
+                        <menu_item_separator label="-----------" name="separator"/>
+                        <menu_item_call label="Web ブラウザのテスト" name="Web Browser Test"/>
+                        <menu_item_call label="UIを編集可能にする" name="Editable UI"/>
+                        <menu_item_call label="SelectMgrをダンプ" name="Dump SelectMgr"/>
+                        <menu_item_call label="持ち物の出力" name="Dump Inventory"/>
+                        <menu_item_call label="フォーカスホールダーをダンプ" name="Dump Focus Holder"/>
+                        <menu_item_call label="選択したオブジェクト情報をプリント" name="Print Selected Object Info"/>
+                        <menu_item_call label="エージェント情報をプリント" name="Print Agent Info"/>
+                        <menu_item_call label="メモリ使用状況" name="Memory Stats"/>
+                        <menu_item_call label="グループ情報のキャッシュをクリア" name="Clear Cached Group Info"/>
+                        <menu_item_separator label="-----------" name="separator2"/>
+                        <menu_item_check label="SelectMgr のデバッグ" name="Debug SelectMgr"/>
+                        <menu_item_check label="ダブルクリック" name="Debug Clicks"/>
+                        <menu_item_check label="表示のデバッグ" name="Debug Views"/>
+                        <menu_item_check label="名称ツールチップのデバッグ" name="Show Name Tooltips"/>
+                        <menu_item_check label="マウス操作によるイベントのデバッグ" name="Debug Mouse Events"/>
+                        <menu_item_check label="キーのデバッグ" name="Debug Keys"/>
+                        <menu_item_check label="WindowProcのデバッグ" name="Debug WindowProc"/>
+                        <menu_item_check label="テキスト・エディタのヒントをデバッグ" name="Debug Text Editor Tips"/>
+                        <menu_item_separator label="-----------" name="separator3"/>
+                        <menu_item_check label="時間を表示する" name="Show Time"/>
+                        <menu_item_check label="描画情報を表示する" name="Show Render Info"/>
+                        <menu_item_check label="マトリックスを表示する" name="Show Matrices"/>
+                        <menu_item_check label="カーソルを乗せた場所の色を表示する" name="Show Color Under Cursor"/>
+                </menu>
+                <menu label="XUI" name="XUI">
+                        <menu_item_call label="ウィンドウのテスト" name="Floater Test"/>
+                        <menu_item_call label="フォントのテスト" name="Font Test"/>
+                        <menu_item_call label="メニューをXMLで書き出し..." name="Export Menus to XML..."/>
+                        <menu_item_call label="UIの編集..." name="Edit UI..."/>
+                        <menu_item_call label="XMLから読み込む" name="Load from XML..."/>
+                        <menu_item_call label="XMLで保存する" name="Save to XML..."/>
+                        <menu_item_check label="XUIネームを表示する" name="Show XUI Names"/>
+                        <menu_item_call label="テスト用 IM を送信する" name="Send Test IMs"/>
+                </menu>
+                <menu label="アバター" name="Character">
+                        <menu label="ベークドテクスチャを取得する" name="Grab Baked Texture">
+                                <menu_item_call label="瞳" name="Iris"/>
+                                <menu_item_call label="頭" name="Head"/>
+                                <menu_item_call label="上半身" name="Upper Body"/>
+                                <menu_item_call label="下半身" name="Lower Body"/>
+                                <menu_item_call label="スカート" name="Skirt"/>
+                        </menu>
+                        <menu label="キャラクターテスト" name="Character Tests">
+                                <menu_item_call label="容姿を XML に保存する" name="Appearance To XML"/>
+                                <menu_item_call label="キャラクタジオメトリの切り替え" name="Toggle Character Geometry"/>
+                                <menu_item_call label="男性アバターのテスト" name="Test Male"/>
+                                <menu_item_call label="女性アバターのテスト" name="Test Female"/>
+                                <menu_item_call label="PGを有効にする" name="Toggle PG"/>
+                                <menu_item_check label="アバターの選択を許可" name="Allow Select Avatar"/>
+                        </menu>
+                        <menu_item_check label="ボイスに合わせて唇を動かす" name="Enable Lip Sync (Beta)"/>
+                        <menu_item_check label="矢印キーのTap-Tap-Holdで走る" name="Tap-Tap-Hold To Run"/>
+                        <menu_item_call label="パラメータを強制的にデフォルトにする" name="Force Params to Default"/>
+                        <menu_item_call label="頂点シェーダの再読込" name="Reload Vertex Shader"/>
+                        <menu_item_check label="アニメーション情報" name="Animation Info"/>
+                        <menu_item_check label="スローモーションのアニメーション" name="Slow Motion Animations"/>
+                        <menu_item_check label="見ているものを表示する" name="Show Look At"/>
+                        <menu_item_check label="クリックした場所を表示する" name="Show Point At"/>
+                        <menu_item_check label="見ているものを自分にだけ表示" name="Private Look At"/>
+                        <menu_item_check label="クリックした場所を自分にだけ表示" name="Private Point At"/>
+                        <menu_item_check label="結合部のアップデートのデバッグ" name="Debug Joint Updates"/>
+                        <menu_item_check label="LOD を無効にする" name="Disable LOD"/>
+                        <menu_item_check label="キャラクターVis のデバッグ" name="Debug Character Vis"/>
+                        <menu_item_check label="骨組みの衝突判定を表示する" name="Show Collision Skeleton"/>
+                        <menu_item_check label="エージェントのターゲットを表示する" name="Display Agent Target"/>
+                        <menu_item_check label="回転をデバッグ" name="Debug Rotation"/>
+                        <menu_item_call label="アタッチメントをダンプ" name="Dump Attachments"/>
+                </menu>
+                <menu label="クラッシュ" name="Crash">
+                        <menu_item_call label="バッドメモリアクセスを実行する" name="Force Bad Memory Access"/>
+                        <menu_item_call label="LLErrorとクラッシュを実行する" name="Force LLError And Crash"/>
+                        <menu_item_call label="無限ループ" name="Force Infinite Loop"/>
+                        <menu_item_call label="ドライバのクラッシュを実行する" name="Force Driver Crash"/>
+                        <menu_item_call label="ビューワの接続遮断を実行する" name="Force Disconnect Viewer"/>
+                        <menu_item_separator label="-----------" name="separator"/>
+                        <menu_item_check label="デバッグ用のミニダンプを出力する" name="Output Debug Minidump"/>
+                </menu>
+                <menu label="ネットワーク" name="Network">
+                        <menu_item_call label="メッセージログを有効にする" name="Enable Message Log"/>
+                        <menu_item_call label="メッセージログを使用不可にする" name="Disable Message Log"/>
+                        <menu_item_separator label="-----------" name="separator"/>
+                        <menu_item_check label="速力が挿入されたオブジェクト" name="Velocity Interpolate Objects"/>
+                        <menu_item_check label="挿入されたオブジェクトの位置の Ping" name="Ping Interpolate Object Positions"/>
+                        <menu_item_separator label="-----------" name="separator2"/>
+                        <menu_item_call label="パケットドロップ" name="Drop a Packet"/>
+                </menu>
+                <menu label="レコーダー" name="Recorder">
+                        <menu_item_call label="全セッションのログを記録" name="Full Session Logging"/>
+                        <menu_item_call label="ログの記録開始" name="Start Logging"/>
+                        <menu_item_call label="ログの記録停止" name="Stop Logging"/>
+                        <menu_item_call label="10秒間ログを記録" name="Log 10 Seconds"/>
+                        <menu_item_call label="30秒間ログを記録" name="Log 30 Seconds"/>
+                        <menu_item_call label="60秒間ログを記録" name="Log 60 Seconds"/>
+                        <menu_item_separator label="-----------" name="separator"/>
+                        <menu_item_call label="再生開始" name="Start Playback"/>
+                        <menu_item_call label="再生停止" name="Stop Playback"/>
+                        <menu_item_check label="再生をループ" name="Loop Playback"/>
+                        <menu_item_call label="記録開始" name="Start Record"/>
+                        <menu_item_call label="記録停止" name="Stop Record"/>
+                </menu>
+                <menu label="管理者オプション" name="Admin Options">
+                        <menu_item_check label="管理者メニューを表示する" name="View Admin Options"/>
+                        <menu_item_call label="管理者ステータスの呼び出し" name="Request Admin Status"/>
+                        <menu_item_call label="管理者ステータス解除" name="Leave Admin Status"/>
+                </menu>
+                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_check label="オブジェクトのアップデートを表示する" name="Show Updates"/>
+                <menu_item_separator label="-----------" name="separator4"/>
+                <menu_item_check label="シャッター音とアニメーションなしでスナップショットをディスクに保存する" name="Quiet Snapshots to Disk"/>
+                <menu_item_call label="画像を圧縮" name="Compress Image..."/>
+                <menu_item_check label="ビルドの最大制限を解除" name="Disable Max Build Constraints"/>
+                <menu_item_check label="権限の詳細を表示する" name="Debug Permissions"/>
+                <menu_item_check label="マウスの動きをスムーズに" name="Mouse Smoothing"/>
+                <menu_item_check label="マウスルック時に十字カーソルを表示" name="Show Mouselook Crosshairs"/>
+                <menu_item_separator label="-----------" name="separator5"/>
+                <menu_item_check label="次回の起動時にコンソールウィンドウを表示する" name="Console Window"/>
+                <menu_item_check label="Restrained Loveの使用" name="Restrained Love Support"/>
+                <menu_item_check label="複数のImprudenceの同時起動を許可" name="Allow Multiple Instances"/>
+                <menu_item_call label="ログアウト" name="Logout"/>
+                <menu_item_call label="デバッグ設定を表示する" name="Debug Settings"/>
        </menu>
+        
 </menu_bar>
diff --git a/linden/indra/newview/skins/default/xui/ja/notifications.xml b/linden/indra/newview/skins/default/xui/ja/notifications.xml
index 77c6068..6da6ccc 100644
--- a/linden/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/ja/notifications.xml
@@ -3271,6 +3271,30 @@ Macの場合は、Cmd-Opt-Shift-Dを押してください。
        <notification name="UnableToOpenCommandURL">
                クリックしたURLはこのウェブブラウザでは開けません
        </notification>
+<!-- ここから Imprudence 固有の通知 -->
+        <notification name="ConfirmAutoPilot">
+                本当にここまで歩きますか？
+                <usetemplate ignoretext="オートパイロットする時" name="okcancelignore" notext="キャンセル" yestext="歩く"/>
+        </notification>
+        
+        <notification name="ConfirmDoubleClickTP">
+                本当にここにテレポートしますか？
+                <usetemplate ignoretext="ダブルクリックテレポート時" name="okcancelignore" notext="キャンセル" yestext="テレポート"/>
+        </notification>
+        
+        <notification name="ConfirmTeleportHome">
+                本当にホームにテレポートしますか？
+                <usetemplate ignoretext="ホームにテレポートする時" name="okcancelignore" notext="キャンセル" yestext="テレポート"/>
+        </notification>
+<!-- ここまで Imprudence 固有の通知 -->
        <global name="UnsupportedCPU">
                - あなたの CPU の速度は必須動作環境の条件を満たしていません。
        </global>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_avatar.xml b/linden/indra/newview/skins/default/xui/ja/panel_avatar.xml
index a3745a2..147a5f6 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_avatar.xml
@@ -60,6 +60,7 @@
                        <text name="Photo:">
                                写真：
                        </text>
+                        <button label="UUIDコピー" name="btn_copy_uuid"/>
                        <texture_picker label="" name="img" tool_tip="写真をクリックして選択"/>
                        <text name="Groups:">
                                グループ：
@@ -77,8 +78,11 @@
                        </text>
                        <view_border name="drop_target_rect" />
                        <view_border name="drop_target_rect_vis" />
-                        <text name="Give inventory" tool_tip="ここに物品目をドロップしてこの人に贈ります">
+                        <text name="drop target" tool_tip="ここに持ち物アイテムをドロップしてこの人に贈ります">
-                                持ち物アイテムをここにドロップします
+                                持ち物アイテムを
+                        </text>
+                        <text name="Give inventory 2" tool_tip="ここに持ち物アイテムをドロップしてこの人に贈ります">
+                                ここにドロップします
                        </text>
                        <check_box label="検索に表示" name="allow_publish" tool_tip="検索で、詳細やイメージなどさらなるプロフィール情報を公開する。"/>
                        <button label="?" label_selected="?" name="?"/>
@@ -87,6 +91,7 @@
                        <button label="フレンドに追加" label_selected="フレンドに追加" name="Add Friend..." />
                        <button label="支払う" label_selected="支払う" name="Pay..."/>
                        <button label="IMを送る" label_selected="IMを送る" name="Instant Message..." tool_tip="インスタント・メッセージ (IM)" />
+                        <button label="グループに招待..." label_selected="グループに招待" name="Invite to Group..." />
                        <button label="無視する" label_selected="無視する" name="Mute" />
                </panel>
                <panel label="ウェブ" name="WebProfile">
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_groups.xml b/linden/indra/newview/skins/default/xui/ja/panel_groups.xml
index adfdcd4..f326a13 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_groups.xml
@@ -13,6 +13,8 @@
        <button label="抜ける" name="Leave" />
        <button label="作成..." name="Create" />
        <button label="検索..." name="Search..." />
+        <button label="招待..." name="Invite..." />
+        <button label="タイトル..." name="Titles..." />
  <string name="none">
                グループなし
  </string>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_mini_map.xml b/linden/indra/newview/skins/default/xui/ja/panel_mini_map.xml
index fdc4465..2f07116 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_mini_map.xml
@@ -24,4 +24,15 @@
        <text name="nw_label" width="40">
                北西
        </text>
+  
+  <string name="tooltip_tp">
+    ダブルクリックでテレポートします
+  </string>
+  <string name="tooltip_pan">
+    Shift+ドラッグでパンします
+  </string>
+  <string name="tooltip_map">
+    ダブルクリックで地図を開きます
+  </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
index ef13a75..4b5a2bb 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
@@ -1,4 +1,33 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="advanced_panel">
+<panel label="高度な設定" name="advanced_panel">
+        <check_box label="ログイン／ログアウト画面を非表示" name="disable_log_screen_check"/>
+        <check_box label="テレポート画面を非表示" name="disable_tp_screen_check"/>
+        <check_box label="名前タグに使用ビューワの名称を表示" name="client_name_tag_check"/>
+        <check_box label="ビューワを色で識別" name="client_name_color_check"/>
+        <check_box label="ビューワの名称にヒントを表示" name="client_name_hover_check"/>
+        <check_box label="自分のビューワ名称をタグに表示" name="client_name_tag_broadcast_check"/>
+        <check_box label="影を有効にする（警告：動作が不安定になり、高いグラフィック性能が必要です。）" name="shadows_check"/>
+        <text bottom_delta="-25" left="16" height="15" width="300"
+        follows="top|left">
+                LightShare機能の使用（OpenSimのみ）：
+        </text>
+        <combo_box name="lightshare_combo">
+                <combo_item name="never">
+                        使用しない
+                </combo_item>
+                <combo_item name="ask">
+                        毎回確認
+                </combo_item>
+                <combo_item name="always">
+                        常に使用
+                </combo_item>
+        </combo_box>
+        <check_box label="HTTPテクスチャを使用（試験中の機能）" name="http_texture_check"/>
+        <check_box label="遠距離の描画をスキップして早く読み込む" name="speed_rez_check"/>
+        <check_box label="容姿編集中のアニメーションを表示" name="appearance_anim_check"/>
+        <check_box label="伝統的なパイメニューを使用" name="legacy_pie_menu_checkbox"/>
        <check_box label="言語をオブジェクトと共有" name="language_is_public" tool_tip="優先言語をインワールドのオブジェクトが認識する"/>
+        <check_box label="チャットとIMで MU* ポーズ・スタイルを使用" name="allow_mupose"/>
+        <check_box label="OOCチャットの自動クローズ" name="auto_close_ooc"/>
+        <button label="全ての設定を初期値に戻す" name="reset_btn"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_audio.xml
index 9a8d175..c617ba1 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_audio.xml
@@ -20,6 +20,7 @@
        </text>
        <check_box label="音楽がある場合再生する（通信が重くなる）"
             name="streaming_music" />
+        <check_box label="音楽のタイトルをチャットに表示" name="show_stream_title"/>
        <check_box
             label="ストリーミング・メディア使用可時に再生（帯域幅の消費増）"
             name="streaming_video" />
@@ -35,11 +36,15 @@
        <text type="string" length="1" name="ui_volume_text">
                UI音量：
        </text>
+        <text name="ambient_prefs_text">
+                環境音：
+        </text>
+        <check_box label="風の発生を有効にする" name="mute_wind_check"/>
        <slider label="ドップラー効果" name="Doppler Effect" />
        <slider label="遠隔要因" name="Distance Factor" />
        <slider label="ロールオフ係数" name="Rolloff Factor" />
        <spinner label="L$変更基準点" name="L$ Change Threshold" />
-        <spinner label="ヘルス変化基準点" name="Health Change Threshold" />
+        <spinner label="ヘルス変化基準点" name="Health change threshold" />
        <text type="string" length="1" name="doppler_effect_text">
                オーディオ環境設定：
        </text>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_preferences_fonts.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_fonts.xml
new file mode 100644
index 0000000..3cf54b7
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_fonts.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="フォント" name="font_panel">
+  <text>
+    ユーザー・インターフェースのフォントを変更できます。（再起動後に有効）
+  </text>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
index 83b21b8..ee99373 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
@@ -32,8 +32,16 @@
                UI サイズ：
        </text>
        <check_box label="解像度独立スケールを使用" name="ui_auto_scale"/>
+        <check_box label="操作していない時は退席／AFK" name="afk_timeout_checkbox"/>
        <spinner label="退席までの時間：" name="afk_timeout_spinner"/>
+        <!-- リンデン・ドル支払／受取の通知は「ポップアップ」タブへ移動
        <check_box label="リンデン・ドル（L$）の支払い/受け取りを通知" name="notify_money_change_checkbox"/>
+        -->
+        <text name="Mini-Map Notify:">
+                ミニマップ通知：
+        </text>
+        <check_box label="チャット範囲に入った時" name="mini_map_notify_chat"/>
+        <check_box label="SIMに入った時" name="mini_map_notify_sim"/>
        <text name="maturity_desired_label">
                レーティング区分：
        </text>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
index 167bc2a..bca61d9 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
@@ -5,6 +5,7 @@
        </text>
        <button label="?" name="GraphicsPreferencesHelpButton" />
        <check_box label="ウィンドウ内で Second Life を起動" name="windowed mode" />
+        <check_box label="Windlightツールバーを表示" name="toggle_windlight_control"/>
        <text_editor name="voice_chat_description">
                チェック無しの場合は、ログイン時にフルスクリーン表示
        </text_editor>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_im.xml
index a2c13bb..8d4a564 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_im.xml
@@ -11,9 +11,14 @@
                ログインして変更してください
        </text>
        <check_box label="IMを電子メール（[EMAIL]）へ送信" name="send_im_to_email"/>
-        <check_box label="チャットコンソールにIMを表示する" name="include_im_in_chat_console"/>
+        <text name="show_ims_label">
+                IMの表示：
+        </text>
+        <check_box label="チャットコンソールに表示" name="include_im_in_chat_console" left="208"/>
+        <check_box label="チャット履歴に表示" name="include_im_in_chat_history" left="358"/>
        <check_box label="IMにタイムスタンプを表示" name="show_timestamps_check"/>
        <check_box label="オンライン・フレンド通知を表示" name="friends_online_notify_checkbox"/>
+        <check_box label="IMタブを縦並びに（再起動後に有効）" name="vertical-imtabs-toggle"/>
        <text name="text_box4">
                記録オプション：
        </text>
@@ -29,4 +34,5 @@
                取り込み中
 応答メッセージ：
        </text>
+        <button label="IM応答オプション" name="busy_adv_btn"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_input.xml
index ded6f9d..ed20af2 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_input.xml
@@ -21,11 +21,42 @@
        <text name="Camera Follow Distance:">
                カメラ追従距離：
        </text>
+        <text name="Camera Transition Time:">
+                カメラ切替時間：
+        </text>
+        <text name="Camera Smoothing:">
+                カメラの滑らかさ：
+        </text>
+        
        <check_box label="編集カメラの自動移動" name="edit_camera_movement" tool_tip="編集モードの開始、終了時はカメラ自動位置調整を使用"/>
        <check_box label="容姿カメラの自動移動" name="appearance_camera_movement" tool_tip="編集モードでは、カメラ自動位置調整を使用"/>
+        <check_box label="カメラ移動の制限を解除" name="Disable camera constraints"/>
+        <check_box label="ズームの最短距離制限を解除" name="disable_min_zoom_check"/>
        <text name="text2">
                アバター表示：
        </text>
        <check_box label="アバターを一人称視点（マウスルック）で表示" name="first_person_avatar_visible"/>
        <button label="ジョイスティック設定" name="joystick_setup_button"/>
+        <text name="double_click_action_label">
+                ダブルクリック時の動作：
+        </text>
+        <combo_box name="double_click_action">
+                <combo_item name="None">
+                        なし
+                </combo_item>
+                <combo_item name="Go">
+                        オートパイロット
+                </combo_item>
+        </combo_box>
+        <text name="go_action_label">
+                オートパイロットの種類：
+        </text>
+        <combo_box name="go_action">
+                <combo_item name="Move">
+                        歩く
+                </combo_item>
+                <combo_item name="Teleport">
+                        テレポート
+                </combo_item>
+        </combo_box>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_preferences_popups.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_popups.xml
index 9c1ca6e..75b316c 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_popups.xml
@@ -18,4 +18,5 @@
        <button width="235" label="ポップアップ全てを有効化..." label_selected="「次回表示」ダイアログリセット..." name="reset_dialogs_btn" tool_tip="全てのオプショナルポップアップと「初回使用」通知を有効にしてください。"/>
        <button width="235" label="これらのポップアップ全てを無効化..." name="skip_dialogs_btn" tool_tip="全てのオプショナルポップアップと「初回使用」通知を無効にしてください。"/>
        <check_box label="新たに受け取ったオブジェクトを持ち物に自動的に表示" name="show_in_inventory"/>
+        <check_box label="[CURRENCY]を使用・受け取る時に通知" name="notify_money_change_checkbox"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_radar.xml b/linden/indra/newview/skins/default/xui/ja/panel_radar.xml
new file mode 100644
index 0000000..ae86ae6
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/ja/panel_radar.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- Note: panel rect (size) is specified in floater_mini_map.xml -->
+<panel name="RadarPanel" label="レーダー">
+  <string name="no_one_near">
+    近くに誰もいません
+  </string>
+  <string name="is_muted">
+    (ミュート)
+  </string>
+  <string name="is_typing">
+    (タイプ中)
+  </string>
+  <string name="entering_chat_range">
+    [NAME] さんがチャットレンジに入ってきました。 ([DISTANCE]m)
+  </string>
+  <string name="entering_sim_range">
+    [NAME] さんがSIMに入ってきました。 ([DISTANCE]m)
+  </string>
+  <string name="avatars_in_singular">
+    [COUNT]人のアバター
+  </string>
+  <string name="avatars_in_plural">
+    [COUNT]人のアバター
+  </string>
+  <string name="unknown_avatar">
+    (不明)
+  </string>
+  <tab_container name="radar_tab_container">
+    <panel name="avatar_tab" label="アバター">
+      <button name="im_btn" label="IM/コール" tool_tip="IMウィンドウを開きます" />
+      <button name="profile_btn" label="ﾌﾟﾛﾌｨｰﾙ" tool_tip="写真、所属グループ、その他の情報"/>
+      <button name="offer_teleport_btn" label="TPを送る" tool_tip="この人にテレポートを送って自分のところに呼びます"/>
+      <button name="teleport_btn" label="居場所へTP" tool_tip="この人のいるところにテレポートします"/>
+      <button name="track_btn" label="追跡する" tool_tip="地図上のフレンドにビーコンを作成、追跡します"/>
+      <button name="invite_btn" label="招待..." tool_tip="この人を自分の所属グループに招待します"/>
+      <button name="add_btn" label="追加..." tool_tip="この人にフレンド要請を送ります"/>
+    </panel>
+    <panel name="estate_tab" label="不動産管理">
+      <button name="cam_btn" label="カメラ追跡"/>
+      <button name="freeze_btn" label="動けなくする..."/>
+      <button name="eject_btn" label="追い出す..."/>
+      <button name="ban_btn" label="立入禁止..."/>
+      <button name="mute_btn" label="ミュート..."/>
+      <button name="unmute_btn" label="ﾐｭｰﾄ解除..."/>
+      <button name="ar_btn" label="報告..."/>
+    </panel>
+  </tab_container>
+  <scroll_list name="RadarList">
+    <column name="avatar_name" label="名前"/>
+    <column name="avatar_distance" label="距離"/>
+  </scroll_list>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_windlight_controls.xml b/linden/indra/newview/skins/default/xui/ja/panel_windlight_controls.xml
new file mode 100644
index 0000000..bfe6a42
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/ja/panel_windlight_controls.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="windlight_controls">
+  <button label="環境編集" name="Environment"/>
+  <flyout_button label="空" name="Presets">
+  </flyout_button>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/strings.xml b/linden/indra/newview/skins/default/xui/ja/strings.xml
index b71ab22..03ab8d3 100644
--- a/linden/indra/newview/skins/default/xui/ja/strings.xml
+++ b/linden/indra/newview/skins/default/xui/ja/strings.xml
@@ -484,7 +484,7 @@
        <string name="xml_file">
                XMLファイル
        </string>
-        <string name="dot_raw_file">
+        <string name="raw_file">
                RAWファイル
        </string>
        <string name="compressed_image_files">
diff --git a/linden/indra/newview/skins/default/xui/ko/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/ko/floater_instant_message.xml
index f1d0a48..68284be 100644
--- a/linden/indra/newview/skins/default/xui/ko/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_instant_message.xml
@@ -21,6 +21,9 @@
        <string name="default_text_label">
                메신저를 사용하려면 여기를 클릭하십시오.
        </string>
+        <string name="add_friend_string">
+                친구 추가
+        </string>
        <flyout_button label="프로필" name="profile_callee_btn" />
        <button label="음성연결" name="start_call_btn" />
        <button label="연결종료" name="end_call_btn" />
diff --git a/linden/indra/newview/skins/default/xui/ko/floater_tools.xml b/linden/indra/newview/skins/default/xui/ko/floater_tools.xml
index b430cd1..1161196 100644
--- a/linden/indra/newview/skins/default/xui/ko/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_tools.xml
@@ -146,8 +146,7 @@
                        </text>
                        <button label="양도..." label_selected="양도..." name="button deed"
                             tool_tip="그룹 공유 오브젝트는 그룹 운영진이 양도할 수 있습니다." />
-                        <check_box label="아무나 이동 허용" name="checkbox allow everyone move" />
+                        <check_box label="복사" name="checkbox allow everyone copy" />
-                        <check_box label="아무나 복사 허용" name="checkbox allow everyone copy" />
                        <check_box label="검색 보기" name="search_check"
                             tool_tip="사람들이 이 오브젝트 검색 결과를 보게 합니다." />
                        <check_box label="판매 여부" name="checkbox for sale" />
diff --git a/linden/indra/newview/skins/default/xui/ko/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/ko/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/ko/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</menu>
diff --git a/linden/indra/newview/skins/default/xui/pl/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/pl/floater_instant_message.xml
index 1d918b8..40b7c6e 100755
--- a/linden/indra/newview/skins/default/xui/pl/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/pl/floater_instant_message.xml
@@ -24,6 +24,9 @@
        <string name="typing_start_string">
                [NAME] pisze...
        </string>
+        <string name="add_friend_string">
+                Dodaj Znajomość
+        </string>
        <string name="session_start_string">
                Rozpoczęcie rozmowy z [NAME]. Proszę czekać...
        </string>
diff --git a/linden/indra/newview/skins/default/xui/pl/floater_tools.xml b/linden/indra/newview/skins/default/xui/pl/floater_tools.xml
index c896222..62da67d 100755
--- a/linden/indra/newview/skins/default/xui/pl/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/pl/floater_tools.xml
@@ -126,8 +126,11 @@
                                Przypisz
                        </string>
                        <button label="Przypisz..." label_selected="Przypisz..." name="button deed" tool_tip=""/>
-                        <check_box label="Pozwól przesuwać każdemu" name="checkbox allow everyone move"/>
+                        <text name="Anyone can:">
-                        <check_box label="Pozwól kopiować każdemu" name="checkbox allow everyone copy"/>
+                                Każdy:
+                        </text>
+                        <check_box label="Przesuń" name="checkbox allow everyone move"/>
+                        <check_box label="Kopiuj" name="checkbox allow everyone copy"/>
                        <check_box label="Pokaż w wyszukiwarce" name="search_check" tool_tip="Udostępnij wyświetlanie się tego przedmiotu w wynikach wyszukiwania"/>
                        <check_box label="Na Sprzedaż" name="checkbox for sale"/>
                        <text name="Cost">
diff --git a/linden/indra/newview/skins/default/xui/pl/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/pl/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pl/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</menu>
diff --git a/linden/indra/newview/skins/default/xui/pl/strings.xml b/linden/indra/newview/skins/default/xui/pl/strings.xml
index 325fe79..713cbb3 100755
--- a/linden/indra/newview/skins/default/xui/pl/strings.xml
+++ b/linden/indra/newview/skins/default/xui/pl/strings.xml
@@ -480,7 +480,7 @@
        <string name="xml_file">
                Plik XML
        </string>
-        <string name="dot_raw_file">
+        <string name="raw_file">
                Plik RAW
        </string>
        <string name="compressed_image_files">
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml
index 983a13c..dc69246 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml
@@ -33,6 +33,9 @@
        <string name="unavailable_text_label">
                Conversa por texto não está disponível para esta chamada.
        </string>
+        <string name="add_friend_string">
+                Adicionar amigo
+        </string>
        <flyout_button label="Perfil..." name="profile_callee_btn"/>
        <button label="Chamar" name="start_call_btn"/>
        <button label="Terminar Chamada" name="end_call_btn"/>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_tools.xml b/linden/indra/newview/skins/default/xui/pt/floater_tools.xml
index 4f5054d..b5e4e4a 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_tools.xml
@@ -122,8 +122,11 @@
                                Doar
                        </string>
                        <button label="Doar..." label_selected="Doar..." name="button deed" tool_tip="Objetos compartilhados do Grupo pode ser doados pelo gerente do grupo."/>
-                        <check_box label="Permitir que qualquer um mova" name="checkbox allow everyone move"/>
+                        <text name="Anyone can:">
-                        <check_box label="Permitir que qualquer um copie" name="checkbox allow everyone copy"/>
+                                Todos:
+                        </text>
+                        <check_box label="Movimentar" name="checkbox allow everyone move"/>
+                        <check_box label="Copiar" name="checkbox allow everyone copy"/>
                        <check_box label="Mostrar na busca" name="search_check" tool_tip="Permitir que as pessoas vejam este objeto nos resultados de busca"/>
                        <check_box label="À Venda" name="checkbox for sale"/>
                        <text name="Cost">
diff --git a/linden/indra/newview/skins/default/xui/pt/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/pt/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</menu>
diff --git a/linden/indra/newview/skins/default/xui/pt/strings.xml b/linden/indra/newview/skins/default/xui/pt/strings.xml
index 7f0b8a8..c7c6a48 100644
--- a/linden/indra/newview/skins/default/xui/pt/strings.xml
+++ b/linden/indra/newview/skins/default/xui/pt/strings.xml
@@ -480,7 +480,7 @@
        <string name="xml_file">
                Arquivo XML
        </string>
-        <string name="dot_raw_file">
+        <string name="raw_file">
                Arquivo RAW
        </string>
        <string name="compressed_image_files">
diff --git a/linden/indra/newview/skins/default/xui/ru/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/ru/floater_instant_message.xml
index 7aa1c19..f0379e1 100644
--- a/linden/indra/newview/skins/default/xui/ru/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/ru/floater_instant_message.xml
@@ -33,6 +33,9 @@
        <string name="unavailable_text_label">
                Текстовый чат недоступен для этого вызова.
        </string>
+        <string name="add_friend_string">
+                Добавить Друга
+        </string>
        <flyout_button label="Профиль..." name="profile_callee_btn"/>
        <button label="Звонок" name="start_call_btn"/>
        <button label="Конец звонка" name="end_call_btn"/>
diff --git a/linden/indra/newview/skins/default/xui/ru/floater_tools.xml b/linden/indra/newview/skins/default/xui/ru/floater_tools.xml
index 63697ac..8400270 100644
--- a/linden/indra/newview/skins/default/xui/ru/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/ru/floater_tools.xml
@@ -122,8 +122,7 @@
                                Дело
                        </string>
                        <button label="Дело..." label_selected="Дело..." name="button deed" tool_tip="Офицер группы может передать групповые объекты для применения."/>
-                        <check_box label="Разрешить двигать всем" name="checkbox allow everyone move"/>
+                        <check_box label="Копир" name="checkbox allow everyone copy"/>
-                        <check_box label="Разрешить копировать всем" name="checkbox allow everyone copy"/>
                        <check_box label="Показывать в поиске" name="search_check" tool_tip="Позволяет людям видеть объект в результатах поиска"/>
                        <check_box label="Для продажи" name="checkbox for sale"/>
                        <text name="Cost" left_delta="110" width="78">
diff --git a/linden/indra/newview/skins/default/xui/ru/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/ru/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/ru/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</menu>
diff --git a/linden/indra/newview/skins/default/xui/ru/strings.xml b/linden/indra/newview/skins/default/xui/ru/strings.xml
index 8d74f34..77d27a7 100644
--- a/linden/indra/newview/skins/default/xui/ru/strings.xml
+++ b/linden/indra/newview/skins/default/xui/ru/strings.xml
@@ -480,7 +480,7 @@
        <string name="xml_file">
                XML файл
        </string>
-        <string name="dot_raw_file">
+        <string name="raw_file">
                RAW файл
        </string>
        <string name="compressed_image_files">
diff --git a/linden/indra/newview/skins/default/xui/tr/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/tr/floater_instant_message.xml
index b627271..3fcb891 100644
--- a/linden/indra/newview/skins/default/xui/tr/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/tr/floater_instant_message.xml
@@ -33,6 +33,9 @@
        <string name="unavailable_text_label">
                Bu arama için yazılı sohbet mevcut değil.
        </string>
+        <string name="add_friend_string">
+                Arkadaş ol
+        </string>
        <flyout_button label="Profil..." name="profile_callee_btn"/>
        <button label="Ara" name="start_call_btn"/>
        <button label="Kapat" name="end_call_btn"/>
diff --git a/linden/indra/newview/skins/default/xui/tr/floater_tools.xml b/linden/indra/newview/skins/default/xui/tr/floater_tools.xml
index 07ee005..932db0a 100644
--- a/linden/indra/newview/skins/default/xui/tr/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/tr/floater_tools.xml
@@ -122,8 +122,7 @@
                                Bağışla
                        </string>
                        <button label="Bağışla..." label_selected="Bağışla..." name="button deed" tool_tip="Grup paylaşımlı objeler grup yetkilisi tarafından bağışlanabilir."/>
-                        <check_box label="Herhangi biri taşıyabilir" name="checkbox allow everyone move"/>
+                        <check_box label="Kopyalama" name="checkbox allow everyone copy"/>
-                        <check_box label="Herhangi biri kopyalayabilir" name="checkbox allow everyone copy"/>
                        <check_box label="Aramada göster" name="search_check" tool_tip="İnsanların bu objeyi arama sonuçlarında görmelerine izin verin"/>
                        <check_box label="Satılık" name="checkbox for sale"/>
                        <text name="Cost">
diff --git a/linden/indra/newview/skins/default/xui/tr/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/tr/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/tr/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</menu>
diff --git a/linden/indra/newview/skins/default/xui/tr/strings.xml b/linden/indra/newview/skins/default/xui/tr/strings.xml
index f3a5c6a..559c1cb 100644
--- a/linden/indra/newview/skins/default/xui/tr/strings.xml
+++ b/linden/indra/newview/skins/default/xui/tr/strings.xml
@@ -454,7 +454,7 @@
        <string name="xml_file">
                XML dosyası
        </string>
-        <string name="dot_raw_file">
+        <string name="raw_file">
                RAW dosyası
        </string>
        <string name="compressed_image_files">
diff --git a/linden/indra/newview/skins/default/xui/uk/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/uk/floater_instant_message.xml
index 60ac3b8..a017d38 100644
--- a/linden/indra/newview/skins/default/xui/uk/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/uk/floater_instant_message.xml
@@ -33,6 +33,9 @@
        <string name="unavailable_text_label">
                Текстовий чат недоступний для цього виклику.
        </string>
+        <string name="add_friend_string">
+                Додати Друга
+        </string>
        <flyout_button label="Профіль..." name="profile_callee_btn"/>
        <button label="Дзвінок" name="start_call_btn"/>
        <button label="Кінець дзвінка" name="end_call_btn"/>
diff --git a/linden/indra/newview/skins/default/xui/uk/floater_tools.xml b/linden/indra/newview/skins/default/xui/uk/floater_tools.xml
index c9e2497..38510a4 100644
--- a/linden/indra/newview/skins/default/xui/uk/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/uk/floater_tools.xml
@@ -122,8 +122,7 @@
                                Справа
                        </string>
                        <button label="Справа..." label_selected="Справа..." name="button deed" tool_tip="Офіцер групи може передати групові об&apos;єкти для застосування."/>
-                        <check_box label="Дозволити рухати усім" name="checkbox allow everyone move"/>
+                        <check_box label="Коп." name="checkbox allow everyone copy"/>
-                        <check_box label="Дозволити копіювати усім" name="checkbox allow everyone copy"/>
                        <check_box label="Показувати в пошуку" name="search_check" tool_tip="Дозволяє людям бачити об&apos;єкт в результатах пошуку"/>
                        <check_box label="Для продажу" name="checkbox for sale"/>
                        <text name="Cost" left_delta="110" width="78">
diff --git a/linden/indra/newview/skins/default/xui/uk/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/uk/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/uk/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</menu>
diff --git a/linden/indra/newview/skins/default/xui/uk/strings.xml b/linden/indra/newview/skins/default/xui/uk/strings.xml
index b737a08..f2d2169 100644
--- a/linden/indra/newview/skins/default/xui/uk/strings.xml
+++ b/linden/indra/newview/skins/default/xui/uk/strings.xml
@@ -480,7 +480,7 @@
        <string name="xml_file">
                XML файл
        </string>
-        <string name="dot_raw_file">
+        <string name="raw_file">
                RAW файл
        </string>
        <string name="compressed_image_files">
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml
index ace6d8c..a59000c 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml
@@ -30,7 +30,10 @@
        <string name="unavailable_text_label">
                本次通话不可以文字聊天。
        </string>
-  <flyout_button label="档案..." name="profile_callee_btn"/>
+        <string name="add_friend_string">
+                添加为好友
+        </string>
+        <flyout_button label="档案..." name="profile_callee_btn"/>
        <button label="呼叫" name="start_call_btn"/>
        <button label="结束呼叫" name="end_call_btn" pad_right="10" visible="false"/>
        <panel name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_tools.xml b/linden/indra/newview/skins/default/xui/zh/floater_tools.xml
index a6eb482..4f7bcf1 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_tools.xml
@@ -122,8 +122,7 @@
                                转让
                        </string>
                        <button label="契约..." label_selected="契约..." name="button deed" tool_tip="社团共享的物体可被社团官员认可。"/>
-                        <check_box label="允许任何人移动" name="checkbox allow everyone move"/>
+                        <check_box label="复制" name="checkbox allow everyone copy"/>
-                        <check_box label="允许任何人复制" name="checkbox allow everyone copy"/>
                        <check_box label="在搜索中显示" name="search_check" tool_tip="让别人可以在搜索结果中看到这件物体。"/>
                        <check_box label="出售" name="checkbox for sale"/>
                        <text name="Cost">
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/zh/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</menu>
diff --git a/linden/indra/newview/skins/default/xui/zh/mime_types.xml b/linden/indra/newview/skins/default/xui/zh/mime_types.xml
index fc5fae4..0cc6f2f 100644
--- a/linden/indra/newview/skins/default/xui/zh/mime_types.xml
+++ b/linden/indra/newview/skins/default/xui/zh/mime_types.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <mimetypes name="default">
-        <defaultlabel>
-                (未知)
-        </defaultlabel>
-        <defaultwidget>
-                无
-        </defaultwidget>
-        <defaultimpl>
-                LLMediaImplLLMozLib
-        </defaultimpl>
        <widgetset name="web">
                <label name="web_label">
                        网页内容
diff --git a/linden/indra/newview/skins/default/xui/zh/strings.xml b/linden/indra/newview/skins/default/xui/zh/strings.xml
index c6b3c5a..3eb0014 100644
--- a/linden/indra/newview/skins/default/xui/zh/strings.xml
+++ b/linden/indra/newview/skins/default/xui/zh/strings.xml
@@ -480,7 +480,7 @@
        <string name="xml_file">
                XML文件
        </string>
-        <string name="dot_raw_file">
+        <string name="raw_file">
                RAW文件
        </string>
        <string name="compressed_image_files">
author	Jacek Antonelli	2011-05-08 15:13:37 -0500
committer	Jacek Antonelli	2011-05-08 15:50:49 -0500
commit	7278f0254a3944bd2bcbf1e855fb0d90c3086a27 (patch)
tree	5d7ecb81ebf1a07482f0a7d3d13acd7f18360c0b /linden/indra/newview/skins/default
parent	Imprudence 1.3.1 released. (diff)
parent	Changed version to Experimental 2011.04.19 (diff)
download	meta-impy-7278f0254a3944bd2bcbf1e855fb0d90c3086a27.zip meta-impy-7278f0254a3944bd2bcbf1e855fb0d90c3086a27.tar.gz meta-impy-7278f0254a3944bd2bcbf1e855fb0d90c3086a27.tar.bz2 meta-impy-7278f0254a3944bd2bcbf1e855fb0d90c3086a27.tar.xz