Merge remote-tracking branch 'jacek/next' into next

Conflicts (manualy merged):
	linden/indra/newview/app_settings/default_grids.xml
	linden/indra/newview/primbackup.cpp
	linden/indra/newview/skins/default/xui/en-us/floater_about.xml
	linden/indra/newview/skins/default/xui/en-us/notifications.xml

InWorldz specific crap removed.

10 files changed, 75 insertions, 13 deletions

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 fb40e39..fe38b2a 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
@@ -36,21 +36,21 @@
         <string name="add_friend_string">
                 Freund hinzufügen
         </string>
-        <flyout_button label="Profil..." name="profile_callee_btn"/>
+        <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">
+    <flyout_button_item 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
+    Inventar hier hereinziehen (Drag &amp; Drop), um es zu senden
   </text>
         <panel left_delta="111" name="speaker_controls">
                 <button label="" name="mute_btn" tool_tip="Voice stummschalten"/>
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 04a8b08..848413c 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
@@ -38,7 +38,7 @@
         </string>
         <layout_stack name="panels">
                 <layout_panel name="im_contents_panel">
-                        <flyout_button label="Gruppeninfo" name="group_info_btn" width="85"/>
+                        <flyout_button label="Gruppeninfo" name="group_info_btn" width="85">
         <flyout_button_item name="history_entry">
           Verlauf anzeigen
         </flyout_button_item>
diff --git a/linden/indra/newview/skins/default/xui/de/notifications.xml b/linden/indra/newview/skins/default/xui/de/notifications.xml
index 3e08d33..aedfe41 100644
--- a/linden/indra/newview/skins/default/xui/de/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/de/notifications.xml
@@ -2996,4 +2996,8 @@ Sollte das Problem fortbestehen, finden Sie weitere Hilfestellung unter: http://
         <global name="PermNo">
                 Nein
         </global>
+
+
+  <global name="view history">Verlauf anzeigen</global>
+
 </notifications>
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 95cdcd0..d40d11d 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
@@ -40,6 +40,7 @@
   http://onefang.net/redmine/ for bug reports, feature requests, bitching, and downloads.
   http://github.com/onefang/meta-impy for the source code.
 
+
   The Imprudence Viewer was rocked hard by:
   Jacek Antonelli, McCabe Maxsted, Armin Weatherwax, Elektra Hesse, and CodeBastard Redgrave.
 
@@ -47,11 +48,11 @@
 
   Imprudence is so awesome thanks to contributions from many generous people:
 
-  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.
+  For their patches and code contributions, we thank Admiral Admiral, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Angus Boyd, Ansariel Hiller, Archimedies Plutonian, Ardy Lay, Asuka Neely, Balp Allen,  Carjay McGinnis, Chalice Yao, Dale Glass, Damian Delacrois, Danny Nolan, Eryn, Felix Duesenburg, Frederick Martian, Geneko Nemeth,  Grandma Bates, Hazim Gazov, Henri Beauchamp, Hg Beeks, Hiroshi Kumaki, Kakurady Drakenar, Katharine Berry, KirstenLee Cinquetti, Kitty Barnett, Latif Khalifa,  Lance Corrimal, Lilly Zenovka, Makomk Makosen, Mana Janus, Matthew Dowd, Michelle2 Zenovka, Mimika Oh, Mm Alder, Nemurimasu Neiro, Nicholaz Beresford, Nicky Perian, Patrick Sapinski, Paul Churchill, Peter Lameth, Qarl Fizz, Revolution Smythe, Robin Cornelius, Seraph Linden, Shyotl Kuhr,  Siana Gearz, SignpostMarv Martin, Stephen Zenith, TankMaster Finesmith, Thickbrick Sleaford, Thomas Shikami, Tom Meta, Tonya Souther, tx Oh, Vaalith Jinn, Vadim Bigbear, Vex Streeter, WhiteStar Magic, Zi Ree, and Zwagoth Klaar.
 
   For their WindLight presets, we thank Ana Lutetia, CodeBastard Redgrave, and Torley Linden.
   
-  Thanks also to the developer(s) of the Emerald Viewer, Hippo Viewer, Cool VL Viewer, Snowglobe Viewer, meta 7 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.
+  Thanks also to the developer(s) of the  Ascent Viewer, Astra Viewer, Cool VL Viewer, Dolphin Viewer, Emerald Viewer, FrozenGlobe Viewer, Hippo Viewer, Meerkat Viewer, Meta7 Viewer, Phoenix Viewer, Singularity Viewer and Snowglobe 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.
   
   For a complete list of who did what, read the release notes!
 
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 b682534..ea48462 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -7302,6 +7302,27 @@ Shadows cannot be enabled due to your graphics settings being set too low. Make
 
 <notification
  icon="alert.tga"
+ name="ExportFailed"
+ type="alert">
+Bad permissions for the exported object. Export aborted.
+</notification>
+
+<notification
+ icon="alert.tga"
+ name="ExportPartial"
+ type="alert">
+Object exported. Some textures could not be saved due to: [REASON]
+</notification>
+
+<notification
+ icon="notifytip.tga"
+ name="ExportSuccessful"
+ type="notifytip">
+Export successful.
+</notification>  
+  
+<notification
+ icon="alert.tga"
  name="Help_CmdLine"
  type="alert">
 Various options for command line features.
@@ -7468,6 +7489,21 @@ The Socks5 proxy "[PROXY]" refused the UDP associate request
 Could not connect to Socks5 proxy server "[PROXY]"
   </notification>
 
+
+  <notification
+   icon="alert.tga"
+   name="FeatureNotAvailableOnOS"
+   type="alert">
+Sorry, [FEATURE] is not yet available on [OS].
+  </notification>
+
+  <!-- Non-specific defaults for use with FeatureNotAvailableOnOS -->
+  <global name="this feature">this feature</global>
+  <global name="this os">this operating system</global>
+
+  <global name="view history">View History</global>
+
+
 <!--End Imprudence notifications-->
  <!-- [KITTY VIEWER] -->
   <notification
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_ao_remote_expanded.xml b/linden/indra/newview/skins/default/xui/en-us/panel_ao_remote_expanded.xml
index 29c34fb..2d71add 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_ao_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_ao_remote_expanded.xml
@@ -3,8 +3,11 @@
      enabled="true" follows="right|bottom" height="45" left="0" mouse_opaque="true"
      name="ao_remote" use_bounding_rect="true" width="96">
   <panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="47" left="0" width="96" />
-  <button bottom="-20" control_name="AOSitsEnabled" enabled="true"
-             follows="left|top" font="SansSerif" height="22" label="AO Sits Off" label_selected="AO Sits On" 
-             mouse_opaque="true" name="ao_sit_btn" width="92" left="3" />
+  <button bottom="-20" control_name="AOSitsEnabled" enabled="true" tool_tip="Toggles AO sit animation" 
+             follows="left|top" font="SansSerif" height="22" label="Sits Off" label_selected="Sits On" 
+             mouse_opaque="true" name="ao_sit_btn" width="66" left="3" label_selected_disabled="Sits Off" />
+  <button bottom="-20" enabled="true" tool_tip="Toggle AO window"
+       follows="left|top" font="SansSerif" height="22" label="" image_overlay="arrow_up.tga" 
+       mouse_opaque="true" name="ao_show_btn" width="22" left_delta="68" />
   <panel bottom="13" filename="panel_ao_remote_controls.xml" name="panel_ao_controls" left="0" width="96" />
 </panel>
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 811a196..389e069 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
@@ -42,6 +42,9 @@
       <string name="days_old_text">
         ([DAYS] days old)
       </string>
+      <string name="invalid">
+        (invalid)
+      </string>
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-23" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifsmall" h_pad="0" halign="left" height="16" left="262"
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 0895e3f..9a06d0f 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
@@ -8,9 +8,12 @@ general Group Preferences and member options.
 
 Hover your mouse over the options for more help.
         </string>
-        <string name="group_info_unchanged">
+  <string name="group_info_unchanged">
                 General group information has changed.
         </string>
+  <string name="copy_group_link_info">
+    Copied group link: [SLURL]
+  </string>
         <button bottom="-24" follows="left|top" font="SansSerif" halign="center" height="16"
              label="?" label_selected="?" left="391" mouse_opaque="true"
              name="help_button" width="20" />
@@ -50,7 +53,10 @@ Hover your mouse over the options for more help.
              width="265" word_wrap="true" spell_check="true">
                 Group Charter
         </text_editor>
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+  <button bottom_delta="-28" follows="left|top" font="SansSerif" halign="center"
+       height="22" label="Copy Group Link"
+       right="-7" mouse_opaque="true" name="copy_link_button" width="128" />
+        <button bottom_delta="28" follows="left|top" font="SansSerif" halign="center"
              height="22" label="Join (free)" label_selected="Join (free)" left="7"
              mouse_opaque="true" name="join_button" width="128" />
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
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 b589a1d..c037439 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
@@ -48,11 +48,16 @@ USE left="270" FOR TABBING OPTIONS
            label="Show WindLight toolbar" left="50"  mouse_opaque="true"
            name="toggle_windlight_control" radio_style="false" width="237"
            control_name="EnableWindlightRemote" />
-      <check_box bottom_delta="-18" enabled="true"
+      <check_box bottom_delta="0" enabled="true"
            follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-           label="Use legacy pie menus" left_delta="0"
+           label="Use legacy pie menus" left="270"
            mouse_opaque="true" name="legacy_pie_menu_checkbox" radio_style="false"
            width="256" />
+      <check_box bottom_delta="-18" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Show AO toolbar" left="50"  mouse_opaque="true"
+           name="toggle_ao_control" radio_style="false" width="237"
+           control_name="EnableAORemote" />
 
 
       <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
diff --git a/linden/indra/newview/skins/default/xui/zh/notifications.xml b/linden/indra/newview/skins/default/xui/zh/notifications.xml
index 0596e76..ea49e35 100644
--- a/linden/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/zh/notifications.xml
@@ -3795,6 +3795,10 @@ Socks5 代理服务器 [PROXY] 拒绝了 UDP 关联请求
 无法连接到 Socks5 代理服务器 [PROXY]
   </notification>
 
+
+  <global name="view history">查看对话历史</global>
+
+
 <!--End Imprudence notifications-->
  <!-- [KITTY VIEWER] -->
   <notification