Merge branch 'master' into DRTVWR-543-maint

37 files changed, 278 insertions, 193 deletions

diff --git a/indra/newview/skins/default/xui/da/menu_place_add_button.xml b/indra/newview/skins/default/xui/da/menu_place_add_button.xml
index 7ad2253550..c43ec6b1b7 100644
--- a/indra/newview/skins/default/xui/da/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/da/menu_place_add_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_folder_gear">
+<toggleable_menu name="menu_create">
 	<menu_item_call label="Opret mappe" name="add_folder"/>
 	<menu_item_call label="Tilføj landemærke" name="add_landmark"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/da/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/da/menu_teleport_history_item.xml
index dbaec62087..825ab056d9 100644
--- a/indra/newview/skins/default/xui/da/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/da/menu_teleport_history_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Teleport History Item Context Menu">
+<toggleable_menu name="Teleport History Item Menu">
 	<menu_item_call label="Teleportér" name="Teleport"/>
 	<menu_item_call label="Mere information" name="More Information"/>
 	<menu_item_call label="Kopiér til udklipsholder" name="CopyToClipboard"/>
-</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_place_add_button.xml b/indra/newview/skins/default/xui/de/menu_place_add_button.xml
index 7c0ff4a46a..975e5b4497 100644
--- a/indra/newview/skins/default/xui/de/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/de/menu_place_add_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_folder_gear">
+<toggleable_menu name="menu_create">
 	<menu_item_call label="Ordner hinzufügen" name="add_folder"/>
 	<menu_item_call label="Landmarke hinzufügen" name="add_landmark"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml
index 1d7e3059c0..8f3bf84151 100644
--- a/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Teleport History Item Context Menu">
+<toggleable_menu name="Teleport History Item Menu">
 	<menu_item_call label="Teleportieren" name="Teleport"/>
 	<menu_item_call label="Weitere Informationen" name="More Information"/>
 	<menu_item_call label="SLurl kopieren" name="CopyToClipboard"/>
-</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index c609e3bd3a..31c524c38a 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -342,6 +342,7 @@
                                             width="25">
                                         <button
                                                 name="skip_back_btn"
+                                                enabled="false"
                                                 follows="top"
                                                 image_overlay="SkipBackward_Off"
                                                 image_disabled="PushButton_Disabled"
@@ -373,6 +374,7 @@
                                             width="25">
                                         <button
                                                 name="play_btn"
+                                                enabled="false"
                                                 follows="top"
                                                 image_overlay="Play_Off"
                                                 image_disabled="PushButton_Disabled"
@@ -434,6 +436,7 @@
                                             width="25">
                                         <button
                                                 name="skip_forward_btn"
+                                                enabled="false"
                                                 follows="top"
                                                 image_overlay="SkipForward_Off"
                                                 image_disabled="PushButton_Disabled"
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 7f863756eb..f4cf2cb512 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -1624,7 +1624,7 @@ Analysed:
          wrap="true"
          width="462"
          visible="true">
-         You dont have rights to upload mesh models. [[VURL] Find out how] to get certified.
+         You don't have rights to upload mesh models. [[VURL] Find out how] to get certified.
        </text> 
        <text
          text_color="Yellow"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_animation.xml b/indra/newview/skins/default/xui/en/floater_preview_animation.xml
index 3ea5f54f2c..d1f8da55be 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_animation.xml
@@ -1,66 +1,126 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- height="85"
+ height="241"
  layout="topleft"
  name="preview_anim"
  help_topic="preview_anim"
- width="280">
+ width="320">
     <floater.string
      name="Title">
         Animation: [NAME]
     </floater.string>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerif"
-     height="19"
-     layout="topleft"
-     left="10"
-     name="desc txt"
-     top="25"
-     width="80">
-        Description:
-    </text>
-    <line_editor
-     border_style="line"
-     border_thickness="1"
-     follows="left|top|right"
-     font="SansSerifSmall"
-     height="19"
-     layout="topleft"
-     left_delta="95"
-     max_length_bytes="127"
-     name="desc"
-     top="19"
-     width="170" />
     <button
      height="20"
      label="Play Inworld"
      label_selected="Stop"
+     follows="left|top"
      layout="topleft"
      left="10"
      name="Inworld"
      tool_tip="Play this animation so that others can see it"
-     top="47"
+     top="25"
      width="125">
        <button.commit_callback
         function="PreviewAnim.Play"
         parameter="Inworld" /> 
     </button>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="19"
+     layout="topleft"
+     left_pad="10"
+     name="desc inworld"
+     top_delta="3"
+     width="160">
+        Other people can see
+    </text>
     <button
      height="20"
      label="Play Locally"
      label_selected="Stop"
+     follows="left|top"
      layout="topleft"
-     left_pad="5"
+     left="10"
      name="Locally"
      tool_tip="Play this animation so that only you can see it"
-     top_delta="0"
+     top_pad="5"
      width="125">
        <button.commit_callback
         function="PreviewAnim.Play"
         parameter="Locally" /> 
     </button>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="19"
+     layout="topleft"
+     left_pad="10"
+     name="desc local"
+     top_delta="3"
+     width="160">
+        Only you can see
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="19"
+     layout="topleft"
+     left="10"
+     name="desc txt"
+     top_pad="7"
+     width="80">
+        Description:
+    </text>
+    <line_editor
+     border_style="line"
+     border_thickness="1"
+     follows="left|top|right"
+     font="SansSerifSmall"
+     height="19"
+     layout="topleft"
+     left="10"
+     right="-10"
+     max_length_bytes="127"
+     name="desc"
+     top_pad="0" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="19"
+     layout="topleft"
+     left="10"
+     name="adv_trigger"
+     top_pad="7"
+     width="100"
+     text_color="EmphasisColor">
+        Advanced
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="91"
+     layout="topleft"
+     left="10"
+     name="AdvancedStats"
+     top_pad="3"
+     width="200">
+Priority: [PRIORITY]
+Duration: [DURATION]s
+Ease In: [EASE_IN]s
+Ease Out: [EASE_OUT]s
+Loop: [IS_LOOP]
+Joints: [NUM_JOINTS]
+    </text>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
index 35d4385487..2abd8ec5c0 100644
--- a/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
@@ -36,16 +36,14 @@
                   stat="FramePixelDifference"
                   bar_max="100"
                   tick_spacing="10"
-                  unit_scale="100"
-                  precision="0"/>
+                  unit_scale="100"/>
         <stat_bar name="bandwidth"
                   label="UDP Data Received"
                   orientation="horizontal"
                   unit_label="kbps"
                   stat="activemessagedatareceived"
                   bar_max="5000"
-                  tick_spacing="500"
-                  precision="0"/>
+                  tick_spacing="500"/>
 			  <stat_bar name="packet_loss"
                   label="Packet Loss"
                   orientation="horizontal"
@@ -53,9 +51,7 @@
                   stat="packetslostpercentstat"
                   bar_max="5"
                   tick_spacing="0.5"
-                  precision="3"
-                  show_bar="false"
-                  show_mean="true"/>
+                  show_bar="false"/>
 		  </stat_view>
 <!--Advanced Section-->
       <stat_view name="advanced"
@@ -73,7 +69,6 @@
                     stat="numobjectsstat"
                     bar_max="50000"
                     tick_spacing="5000"
-                    precision="0"
                     show_bar="false"/>
           <stat_bar name="newobjs"
                     label="New Objects"
@@ -109,12 +104,48 @@
           <stat_bar name="texture_cache_read_latency"
                     label="Cache Read Latency"
                     orientation="horizontal"
-                    unit_label="msec"
+                    unit_label="sec"
                     stat="texture_cache_read_latency"
                     bar_max="1000.f"
                     tick_spacing="100"
                     show_history="true"
                     show_bar="false"/>
+          <stat_bar name="texture_decode_latency"
+                    label="Cache Decode Latency"
+                    orientation="horizontal"
+                    unit_label="sec"
+                    stat="texture_decode_latency"
+                    bar_max="1000.f"
+                    tick_spacing="100"
+                    show_history="true"
+                    show_bar="false"/>
+          <stat_bar name="texture_decode_latency"
+                    label="Cache Write Latency"
+                    orientation="horizontal"
+                    unit_label="sec"
+                    stat="texture_write_latency"
+                    bar_max="1000.f"
+                    tick_spacing="100"
+                    show_history="true"
+                    show_bar="false"/>
+          <stat_bar name="texture_fetch_latency"
+                    label="Cache Fetch Latency"
+                    orientation="horizontal"
+                    unit_label="sec"
+                    stat="texture_fetch_latency"
+                    bar_max="1000.f"
+                    tick_spacing="100"
+                    show_history="true"
+                    show_bar="false"/>
+          <stat_bar name="texture_fetch_time"
+                    label="Cache Fetch Time"
+                    orientation="horizontal"
+                    unit_label="sec"
+                    stat="texture_fetch_time"
+                    bar_max="1000.f"
+                    tick_spacing="100"
+                    show_history="true"
+                    show_bar="false"/>
           <stat_bar name="numimagesstat"
                     label="Count"
                     orientation="horizontal"
@@ -142,7 +173,6 @@
                     unit_label="/sec" 
                     bar_max="1024.f" 
                     tick_spacing="128.f"
-                    precision="1"
                     show_bar="false"/>
 			    <stat_bar name="packetsoutstat"
                     label="Packets Out"
@@ -151,7 +181,6 @@
                     unit_label="/sec"  
                     bar_max="1024.f" 
                     tick_spacing="128.f"
-                    precision="1"
                     show_bar="false"/>
 			    <stat_bar name="objectdatareceived"
                     label="Objects"
@@ -160,7 +189,6 @@
                     unit_label="kbps"
                     bar_max="1024.f"
                     tick_spacing="128.f"
-                    precision="1"
                     show_bar="false"/>
 			    <stat_bar name="texturedatareceived"
                     label="Texture"
@@ -169,7 +197,6 @@
                     unit_label="kbps"
                     bar_max="1024.f"
                     tick_spacing="128.f"
-                    precision="1"
                     show_bar="false"/>
 			    <stat_bar name="assetudpdatareceived"
                     label="Asset"
@@ -178,7 +205,6 @@
                     unit_label="kbps"
                     bar_max="1024.f"
                     tick_spacing="128.f"
-                    precision="1"
                     show_bar="false"/>
 			    <stat_bar name="layersdatareceived"
                     label="Layers"
@@ -187,7 +213,6 @@
                     unit_label="kbps"
                     bar_max="1024.f"
                     tick_spacing="128.f"
-                    precision="1"
                     show_bar="false"/>
 			    <stat_bar name="messagedatain"
                     label="Actual In"
@@ -196,7 +221,6 @@
                     unit_label="kbps"
                     bar_max="1024.f"
                     tick_spacing="128.f"
-                    precision="1"
                     show_bar="false"/>
 			    <stat_bar name="messagedataout"
                     label="Actual Out"
@@ -205,7 +229,6 @@
                     unit_label="kbps"
                     bar_max="1024.f"
                     tick_spacing="128.f"
-                    precision="1"
                     show_bar="false"/>
 			  </stat_view>
 		  </stat_view>
@@ -218,77 +241,61 @@
                   label="Objects"
                   orientation="horizontal"
                   stat="simobjects"
-                  precision="0"
                   bar_max="30000.f" 
                   tick_spacing="5000.f"
-                  show_bar="false"
-                  show_mean="false"/>
+                  show_bar="false"/>
 			  <stat_bar name="simactiveobjects"
                   label="Active Objects"
                   orientation="horizontal"
                   stat="simactiveobjects"
-                  precision="0"
                   bar_max="5000.f" 
                   tick_spacing="750.f"
-                  show_bar="false"
-                  show_mean="false"/>
+                  show_bar="false"/>
 			  <stat_bar name="simactivescripts"
                   label="Active Scripts"
                   orientation="horizontal"
                   stat="simactivescripts"
-                  precision="0"
                   bar_max="15000.f" 
                   tick_spacing="1875.f"
-                  show_bar="false"
-                  show_mean="false"/>
+                  show_bar="false"/>
 			  <stat_bar name="siminpps"
                   label="Packets In"
                   orientation="horizontal"
                   stat="siminpps"
                   unit_label="pps"
-                  precision="0"
                   bar_max="2000.f" 
                   tick_spacing="250.f"
-                  show_bar="false"
-                  show_mean="false"/>
+                  show_bar="false"/>
 			  <stat_bar name="simoutpps"
                   label="Packets Out"
                   orientation="horizontal"
                   stat="simoutpps"
                   unit_label="pps" 
-                  precision="0"
                   bar_max="2000.f" 
                   tick_spacing="250.f"
-                  show_bar="false"
-                  show_mean="false"/>
+                  show_bar="false"/>
 			  <stat_bar name="simpendingdownloads"
                   label="Pending Downloads"
                   orientation="horizontal"
                   stat="simpendingdownloads"
-                  precision="0"
                   bar_max="800.f" 
                   tick_spacing="100.f"
-                  show_bar="false"
-                  show_mean="false"/>
+                  show_bar="false"/>
 			  <stat_bar name="simpendinguploads"
                   label="Pending Uploads"
                   orientation="horizontal"
                   stat="simpendinguploads"
-                  precision="0"
                   bar_max="100.f" 
                   tick_spacing="25.f"
-                  show_bar="false"
-                  show_mean="false"/>
+                  show_bar="false"/>
 			  <stat_bar name="simtotalunackedbytes"
                   label="Total Unacked Bytes"
                   orientation="horizontal"
                   stat="simtotalunackedbytes"
                   unit_label="kb"
-                  precision="1"
                   bar_max="100000.f" 
                   tick_spacing="25000.f"
-                  show_bar="false"
-                  show_mean="false"/>
+                  show_bar="false"/>
 			  <stat_view name="simperf"
                    label="Time (ms)"
                    show_label="true">
@@ -297,81 +304,65 @@
                     orientation="horizontal"
                     stat="simframemsec"
                     unit_label="ms"
-                    precision="3"
                     bar_max="40.f" 
                     tick_spacing="10.f"
-                    show_bar="false"
-                    show_mean="false"/>
+                    show_bar="false"/>
 			    <stat_bar name="simnetmsec"
                     label="Net Time"
                     orientation="horizontal"
                     stat="simnetmsec"
                     unit_label="ms"
-                    precision="3"
                     bar_max="40.f" 
                     tick_spacing="10.f"
-                    show_bar="false"
-                    show_mean="false"/>
+                    show_bar="false"/>
 			    <stat_bar name="simsimphysicsmsec"
                     label="Physics Time"
                     orientation="horizontal"
                     stat="simsimphysicsmsec"
                     unit_label="ms"
-                    precision="3"
                     bar_max="40.f" 
                     tick_spacing="10.f"
-                    show_bar="false"
-                    show_mean="false"/>
+                    show_bar="false"/>
 			    <stat_bar name="simsimothermsec"
                     label="Simulation Time"
                     orientation="horizontal"
                     stat="simsimothermsec"
                     unit_label="ms"
-                    precision="3"
                     bar_max="40.f" 
                     tick_spacing="10.f"
-                    show_bar="false"
-                    show_mean="false"/>
+                    show_bar="false"/>
 			    <stat_bar name="simagentmsec"
                     label="Agent Time"
                     orientation="horizontal"
                     stat="simagentmsec"
                     unit_label="ms"
-                    precision="3"
-                    bar_max="40.f" 
+                     bar_max="40.f" 
                     tick_spacing="10.f"
-                    show_bar="false"
-                    show_mean="false"/>
+                    show_bar="false"/>
 			    <stat_bar name="simimagesmsec"
                     label="Images Time"
                     orientation="horizontal"
                     stat="simimagesmsec"
                     unit_label="ms"
-                    precision="3"
                     bar_max="40.f" 
                     tick_spacing="10.f"
-                    show_bar="false"
-                    show_mean="false"/>
+                    show_bar="false"/>
 			    <stat_bar name="simscriptmsec"
                     label="Script Time"
                     orientation="horizontal"
                     stat="simscriptmsec"
                     unit_label="ms"
-                    precision="3"
                     bar_max="40.f" 
                     tick_spacing="10.f"
-                    show_bar="false"
-                    show_mean="false"/>
+                    show_bar="false"/>
           <stat_bar name="simsparemsec"
                     label="Spare Time"
                     orientation="horizontal"
                     stat="simsparemsec"
                     unit_label="ms"
-                    precision="3"
                     bar_max="40.f"
                     tick_spacing="10.f"
-                    show_bar="false"
-                    show_mean="false"/>
+                    show_bar="false"/>
 <!--2nd level time blocks under 'Details' second-->
           <stat_view name="timedetails"
                      label="Time Details (ms)"
@@ -381,51 +372,41 @@
                       orientation="horizontal"
                       stat="simsimphysicsstepmsec"
                       unit_label="ms"
-                      precision="3"
                       bar_max="40.f"
                       tick_spacing="10.f"
-                      show_bar="false"
-                      show_mean="false"/>
+                      show_bar="false"/>
             <stat_bar name="simsimphysicsshapeupdatemsec"
                       label="  Update Phys Shapes"
                       orientation="horizontal"
                       stat="simsimphysicsshapeupdatemsec"
                       unit_label="ms"
-                      precision="3"
-                      bar_max="40.f"
+                        bar_max="40.f"
                       tick_spacing="10.f"
-                      show_bar="false"
-                      show_mean="false"/>
+                      show_bar="false"/>
             <stat_bar name="simsimphysicsothermsec"
                       label="  Physics Other"
                       orientation="horizontal"
                       stat="simsimphysicsothermsec"
                       unit_label="ms"
-                      precision="3"
                       bar_max="40.f"
                       tick_spacing="10.f"
-                      show_bar="false"
-                      show_mean="false"/>
+                      show_bar="false"/>
             <stat_bar name="simsleepmsec"
                       label="  Sleep Time"
                       orientation="horizontal"
                       stat="simsleepmsec"
                       unit_label="ms"
-                      precision="3"
                       bar_max="40.f"
                       tick_spacing="10.f"
-                      show_bar="false"
-                      show_mean="false"/>
+                      show_bar="false"/>
             <stat_bar name="simpumpiomsec"
                       label="  Pump IO"
                       orientation="horizontal"
                       stat="simpumpiomsec"
                       unit_label="ms"
-                      precision="3"
                       bar_max="40.f"
                       tick_spacing="10.f"
-                      show_bar="false"
-                      show_mean="false"/>
+                      show_bar="false"/>
           </stat_view>
 			  </stat_view>
 		  </stat_view>
diff --git a/indra/newview/skins/default/xui/en/floater_select_key.xml b/indra/newview/skins/default/xui/en/floater_select_key.xml
index 48d9eee4cd..998948fca1 100644
--- a/indra/newview/skins/default/xui/en/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/en/floater_select_key.xml
@@ -33,7 +33,7 @@ Combination [KEYSTR] is reserved by menu.
      height="30"
      layout="topleft"
      left="30"
-     name="descritption"
+     name="description"
      top="25"
      word_wrap="true"
      width="212">
diff --git a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
index 1ea256b8b3..9278a1a598 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
@@ -319,6 +319,18 @@
   </button>
   <button
    follows="left|top"
+   height="22"
+   label="Reset Fetching Time"
+   layout="topleft"
+   left_pad="175"
+   name="reset_time_btn"
+   top_delta="0"
+   width="120">
+    <button.commit_callback
+		function="TexFetchDebugger.ResetFetchTime" />
+  </button>
+  <button
+   follows="left|top"
    height="20"
    label="Cache Read"
    layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index c9fa4324ac..bea06299da 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -703,8 +703,7 @@
              function="Floater.Visible"
              parameter="search" />
             <menu_item_check.on_click
-             function="Floater.Toggle"
-             parameter="search" />
+             function="Avatar.ToggleSearch"/>
             </menu_item_check>
         <menu_item_separator/>
         <menu_item_call
@@ -774,7 +773,7 @@
              label="My land holdings..."
              name="My Land">
             <menu_item_call.on_click
-             function="Floater.Show"
+             function="Floater.ShowOrBringToFront"
              parameter="land_holdings" />
       </menu_item_call>
         <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 95eedf0cf8..2007abefd7 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -214,6 +214,19 @@ Make sure your Internet connection is working properly.
 
   <notification
    icon="alertmodal.tga"
+   name="LoginFailedToParse"
+   type="alertmodal">
+    <tag>fail</tag>
+Viewer received malformed response from server. Please, make sure your Internet connection is working properly and try again later.
+
+If you feel this is in error, please contact Support.
+    <usetemplate
+       name="okbutton"
+       yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
    name="MessageTemplateNotFound"
    type="alertmodal">
 Message Template [PATH] not found.
@@ -2949,6 +2962,14 @@ Darn. You have been logged out of [SECOND_LIFE].
 
   <notification
    icon="alertmodal.tga"
+   name="InventoryUnusable"
+   type="alertmodal">
+There was a problem loading your inventory. First, try logging out and logging in again. If you see this message again, contact Support to correct the problem.
+    <tag>fail</tag>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
    name="OnlyOfficerCanBuyLand"
    type="alertmodal">
 Unable to buy land for the group:
@@ -8765,6 +8786,13 @@ See SecondLife.log for details
     type="alert">
     Error while requesting mesh upload permissons.
   </notification>
+
+  <notification
+    name="MeshUploadProfilerError"
+    icon="alert.tga"
+    type="alert">
+Mesh uploader is incompatible with RenderGLCoreProfile, please turn RenderGLCoreProfile off in debug settings and restart the viewer.
+  </notification>
   
   <notification
     name="RegionCapabilityRequestError"
diff --git a/indra/newview/skins/default/xui/en/panel_group_creation_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_creation_sidetray.xml
index c0265c2fa2..466fb91dd0 100644
--- a/indra/newview/skins/default/xui/en/panel_group_creation_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_creation_sidetray.xml
@@ -307,7 +307,7 @@ background_visible="true"
         top_pad="8"
         word_wrap="true"
         halign="center">
-        Note: After 7 days, a group with no members (other than the creator) is deleted
+        Note: Any group that has less than two members for 48 hours is automatically disbanded
       </text>
     </layout_panel>
   </layout_stack>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index dff6f6e600..5e41ba4ae1 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -227,23 +227,25 @@
      height="10"
      layout="topleft"
      left="30"
-     name="Proxy Settings 1"
-     mouse_opaque="false"
-     top_pad="10"
-     width="300">
-    Proxy Settings:
-  </text>
-  <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="80"
-     name="Proxy Settings 2"
+     name="Proxy Settings:"
      mouse_opaque="false"
      top_pad="5"
      width="300">
-    Your system's existing proxy settings will be used
+    Proxy Settings:
   </text>
+  <button
+	label="Adjust proxy settings"
+    follows="left|top"
+    height="23"
+	width="140"
+    label_selected="Browse"
+    layout="topleft"
+    left_delta="50"
+    name="set_proxy"
+    top_pad="5"
+    >
+    <button.commit_callback
+		  function="Pref.Proxy" />
+  </button>
 </panel>
+
diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml
index 898e92e030..d1cfb8ead6 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
@@ -51,7 +51,7 @@
      left_delta="50"
      name="version_channel_text"
      top_delta="0"
-     width="225">
+     width="400">
         unknown
     </text>
     <text
diff --git a/indra/newview/skins/default/xui/es/floater_buy_contents.xml b/indra/newview/skins/default/xui/es/floater_buy_contents.xml
index 3563d4bd0f..d078868db2 100644
--- a/indra/newview/skins/default/xui/es/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_contents.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_buy_contents" title="COMPRAR LOS CONTENIDOS">
 	<text name="contains_text">
-		&lt;nolink&gt;[NOMBRE]&lt;/nolink&gt; contiene:
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; contiene:
 	</text>
 	<text name="buy_text">
 		¿Comprar por [AMOUNT] L$ a [NAME]?
diff --git a/indra/newview/skins/default/xui/es/floater_import_collada.xml b/indra/newview/skins/default/xui/es/floater_import_collada.xml
index 7e9a00797a..24df8e41a3 100644
--- a/indra/newview/skins/default/xui/es/floater_import_collada.xml
+++ b/indra/newview/skins/default/xui/es/floater_import_collada.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Import Collada" title="Importar escena">
 	<text name="mesh count">
-		Redes: [RECUENTO]
+		Redes: [COUNT]
 	</text>
 	<text name="texture count">
-		Texturas: [RECUENTO]
+		Texturas: [COUNT]
 	</text>
 	<text name="status">
-		Estado: [ESTADO]
+		Estado: [STATUS]
 	</text>
 	<button label="Cancelar" name="cancel"/>
 	<button label="OK" name="ok"/>
@@ -15,9 +15,9 @@
 		Inactivo
 	</string>
 	<string name="status_uploading">
-		Cargando [NOMBRE]
+		Cargando [NAME]
 	</string>
 	<string name="status_creating">
-		Creando objeto [NOMBRE]
+		Creando objeto [NAME]
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/menu_place_add_button.xml b/indra/newview/skins/default/xui/es/menu_place_add_button.xml
index 4b2f908a06..2032b9add9 100644
--- a/indra/newview/skins/default/xui/es/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/es/menu_place_add_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_folder_gear">
+<toggleable_menu name="menu_create">
 	<menu_item_call label="Añadir una carpeta" name="add_folder"/>
 	<menu_item_call label="Añadir este hito" name="add_landmark"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml
index 1ff555b727..d54cd65478 100644
--- a/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Teleport History Item Context Menu">
+<toggleable_menu name="Teleport History Item Menu">
 	<menu_item_call label="Teleportar" name="Teleport"/>
 	<menu_item_call label="Más información" name="More Information"/>
 	<menu_item_call label="Copiar la SLurl" name="CopyToClipboard"/>
-</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index c7750320d5..54707116d4 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -3389,15 +3389,15 @@ Con los siguientes Residentes:
 		Error de transferencia a grupo.
 	</notification>
 	<notification name="ReleaseLandThrottled">
-		La parcela [NOMBRE_PARCELA] no se puede abandonar en este momento.
+		La parcela [PARCEL_NAME] no se puede abandonar en este momento.
 	</notification>
 	<notification name="ReleasedLandWithReclaim">
-		Ya está disponible la parcela [NOMBRE_PARCELA] de [ÁREA] m².
+		Ya está disponible la parcela [PARCEL_NAME] de [AREA] m².
 
-Dispondrás de [PERÍODO_DE_RECLAMACIÓN] horas para reclamar la cantidad de 0 L$ antes de que se ponga en venta.
+Dispondrás de [RECLAIM_PERIOD] horas para reclamar la cantidad de 0 L$ antes de que se ponga en venta.
 	</notification>
 	<notification name="ReleasedLandNoReclaim">
-		Ya está disponible la parcela [NOMBRE_PARCELA] de [ÁREA] m².
+		Ya está disponible la parcela [PARCEL_NAME] de [AREA] m².
 
 Ya está en venta.
 	</notification>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 204fbb1002..4b7f6a0081 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -204,10 +204,10 @@ Si deseas obtener más información, consulta las preguntas frecuentes que apare
 http://secondlife.com/viewer-access-faq
 	</string>
 	<string name="LoginIntermediateOptionalUpdateAvailable">
-		Actualización opcional del visor disponible: [VERSIÓN]
+		Actualización opcional del visor disponible: [VERSION]
 	</string>
 	<string name="LoginFailedRequiredUpdate">
-		Actualización necesaria del visor: [VERSIÓN]
+		Actualización necesaria del visor: [VERSION]
 	</string>
 	<string name="LoginFailedAlreadyLoggedIn">
 		El agente ya ha iniciado sesión.
@@ -248,7 +248,7 @@ support@secondlife.com.
 	</string>
 	<string name="LoginFailedAcountSuspended">
 		No se podrá acceder a tu cuenta hasta las
-[HORA] (horario de la costa del Pacífico).
+[TIME] (horario de la costa del Pacífico).
 	</string>
 	<string name="LoginFailedAccountDisabled">
 		En este momento no podemos completar la solicitud. 
@@ -261,7 +261,7 @@ Ponte en contacto con support@secondlife.com.
 	<string name="LoginFailedAccountMaintenance">
 		Se están realizando tareas rutinarias de mantenimiento en tu cuenta.
 No se podrá acceder a tu cuenta hasta las
-[HORA] (horario de la costa del Pacífico).
+[TIME] (horario de la costa del Pacífico).
 Si crees que se trata de un error, ponte en contacto con support@secondlife.com.
 	</string>
 	<string name="LoginFailedPendingLogoutFault">
@@ -279,7 +279,7 @@ Por favor, aguarda un momento antes de intentar conectarte nuevamente.
 	</string>
 	<string name="LoginFailedRestrictedHours">
 		Tu cuenta solo puede acceder a Second Life
-entre las [INICIO] y las [FIN] (horario de la costa del Pacífico).
+entre las [START] y las [END] (horario de la costa del Pacífico).
 Inténtalo de nuevo durante ese horario.
 Si crees que se trata de un error, ponte en contacto con support@secondlife.com.
 	</string>
diff --git a/indra/newview/skins/default/xui/fr/menu_place_add_button.xml b/indra/newview/skins/default/xui/fr/menu_place_add_button.xml
index 92f9e7719d..4bae34beaa 100644
--- a/indra/newview/skins/default/xui/fr/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/fr/menu_place_add_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_folder_gear">
+<toggleable_menu name="menu_create">
 	<menu_item_call label="Ajouter un dossier" name="add_folder"/>
 	<menu_item_call label="Ajouter un repère" name="add_landmark"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml
index ba8ed9b3f8..ef864029ba 100644
--- a/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Teleport History Item Context Menu">
+<toggleable_menu name="Teleport History Item Menu">
 	<menu_item_call label="Téléporter" name="Teleport"/>
 	<menu_item_call label="Plus d&apos;informations" name="More Information"/>
 	<menu_item_call label="Copier la SLurl" name="CopyToClipboard"/>
-</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_place_add_button.xml b/indra/newview/skins/default/xui/it/menu_place_add_button.xml
index 0e783c0000..abdc0ea794 100644
--- a/indra/newview/skins/default/xui/it/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/it/menu_place_add_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_folder_gear">
+<toggleable_menu name="menu_create">
 	<menu_item_call label="Aggiungi cartella" name="add_folder"/>
 	<menu_item_call label="Aggiungi punto di riferimento" name="add_landmark"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/it/menu_teleport_history_item.xml
index 31236895fa..f7da322006 100644
--- a/indra/newview/skins/default/xui/it/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/it/menu_teleport_history_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Teleport History Item Context Menu">
+<toggleable_menu name="Teleport History Item Menu">
 	<menu_item_call label="Teleport" name="Teleport"/>
 	<menu_item_call label="Maggiori informazioni" name="More Information"/>
 	<menu_item_call label="Copia SLurl" name="CopyToClipboard"/>
-</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_place_add_button.xml b/indra/newview/skins/default/xui/ja/menu_place_add_button.xml
index d5ce88b055..d19bc44451 100644
--- a/indra/newview/skins/default/xui/ja/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/ja/menu_place_add_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_folder_gear">
+<toggleable_menu name="menu_create">
 	<menu_item_call label="フォルダを追加" name="add_folder"/>
 	<menu_item_call label="ランドマークを追加" name="add_landmark"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml
index 61642048b8..1cc230e5b6 100644
--- a/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Teleport History Item Context Menu">
+<toggleable_menu name="Teleport History Item Menu">
 	<menu_item_call label="テレポート" name="Teleport"/>
 	<menu_item_call label="もっと詳しく" name="More Information"/>
 	<menu_item_call label="SLurl をコピー" name="CopyToClipboard"/>
-</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_place_add_button.xml b/indra/newview/skins/default/xui/pl/menu_place_add_button.xml
index ff19f32ba8..107d4fae3a 100644
--- a/indra/newview/skins/default/xui/pl/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/pl/menu_place_add_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu name="menu_folder_gear">
+<toggleable_menu name="menu_create">
 	<menu_item_call label="Dodaj folder" name="add_folder" />
 	<menu_item_call label="Dodaj do Landmarków" name="add_landmark" />
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml
index 7d8519324f..0ed1d510eb 100644
--- a/indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<context_menu name="Teleport History Item Context Menu">
+<toggleable_menu name="Teleport History Item Menu">
 	<menu_item_call label="Teleportuj" name="Teleport" />
 	<menu_item_call label="Więcej szczegółów" name="More Information" />
 	<menu_item_call label="Kopiuj SLurl do schowka" name="CopyToClipboard" />
-</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_place_add_button.xml b/indra/newview/skins/default/xui/pt/menu_place_add_button.xml
index d099d04f8d..89a634d12f 100644
--- a/indra/newview/skins/default/xui/pt/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/pt/menu_place_add_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_folder_gear">
+<toggleable_menu name="menu_create">
 	<menu_item_call label="Adicionar pasta" name="add_folder"/>
 	<menu_item_call label="Adicionar marco" name="add_landmark"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml
index 3a2b3a8847..db759cb4e3 100644
--- a/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Teleport History Item Context Menu">
+<toggleable_menu name="Teleport History Item Menu">
 	<menu_item_call label="Teletransportar" name="Teleport"/>
 	<menu_item_call label="Mais informações" name="More Information"/>
 	<menu_item_call label="Copiar SLurl" name="CopyToClipboard"/>
-</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_place_add_button.xml b/indra/newview/skins/default/xui/ru/menu_place_add_button.xml
index b1a38fb9eb..9298c032d5 100644
--- a/indra/newview/skins/default/xui/ru/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/ru/menu_place_add_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_folder_gear">
+<toggleable_menu name="menu_create">
 	<menu_item_call label="Добавить папку" name="add_folder"/>
 	<menu_item_call label="Добавить закладку" name="add_landmark"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml
index f495d27bf3..84a76ae0e0 100644
--- a/indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Teleport History Item Context Menu">
+<toggleable_menu name="Teleport History Item Menu">
 	<menu_item_call label="Телепорт" name="Teleport"/>
 	<menu_item_call label="Информация" name="More Information"/>
 	<menu_item_call label="Копировать URL SL" name="CopyToClipboard"/>
-</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_place_add_button.xml b/indra/newview/skins/default/xui/tr/menu_place_add_button.xml
index 8e52b3f7f2..69bc265823 100644
--- a/indra/newview/skins/default/xui/tr/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/tr/menu_place_add_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_folder_gear">
+<toggleable_menu name="menu_create">
 	<menu_item_call label="Klasör Ekle" name="add_folder"/>
 	<menu_item_call label="Yer İmi Ekle" name="add_landmark"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml
index d7ff807c3d..59ba134965 100644
--- a/indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Teleport History Item Context Menu">
+<toggleable_menu name="Teleport History Item Menu">
 	<menu_item_call label="Işınla" name="Teleport"/>
 	<menu_item_call label="Ek Bilgi" name="More Information"/>
 	<menu_item_call label="SLurl&apos;i Kopyala" name="CopyToClipboard"/>
-</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_place_add_button.xml b/indra/newview/skins/default/xui/zh/menu_place_add_button.xml
index 95f8917234..165e2b6f08 100644
--- a/indra/newview/skins/default/xui/zh/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/zh/menu_place_add_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_folder_gear">
+<toggleable_menu name="menu_create">
 	<menu_item_call label="添加資料夾" name="add_folder"/>
 	<menu_item_call label="添加地標" name="add_landmark"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml
index bf60983896..200e1904f6 100644
--- a/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="Teleport History Item Context Menu">
+<toggleable_menu name="Teleport History Item Menu">
 	<menu_item_call label="瞬間傳送" name="Teleport"/>
 	<menu_item_call label="更多資訊" name="More Information"/>
 	<menu_item_call label="覆製 SLurl" name="CopyToClipboard"/>
-</context_menu>
+</toggleable_menu>