Merge branch 'develop' into nat/edu-channel

author: Nat Goodspeed <nat@lindenlab.com> 2024-08-13 15:32:47 -0400
committer: Nat Goodspeed <nat@lindenlab.com> 2024-08-13 15:32:47 -0400
commit: 23f2631d598b6e07450a96ed1ec00670c8867cdd (patch)
tree: 20195c1688ad8cb7e8631c97fa5920624f10972c /indra/newview/skins/default/xui/en
parent: 54334ff6e377e35c97df3a0fe2a859795ec07b21 (diff)
parent: 8ce3323269d95f54e2b768c4c5aa154d4afbbb6b (diff)
33 files changed, 2616 insertions, 136 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index ff2fa93cbb..126cd84d56 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -111,7 +111,6 @@ Dummy Name replaced at run time
         PCRE Copyright (c) 1997-2012 University of Cambridge
         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.
         xxHash Copyright (C) 2012-2020 Yann Collet.
         zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
 
diff --git a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
index 91a1dffcb5..889eeb5369 100644
--- a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
+++ b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
@@ -12,7 +12,7 @@
          can_resize="false">
   <string name="hdr_string">HDR Scale:</string>
   <string name="brightness_string">Brightness:</string>
-  <string name="hdr_tooltip">Intensity of lightning effects such as realistically bright skies and dynamic exposure. 1.0 is the default, 0 is off, values between 0 and 1 are mixing Ambient with HDR.</string>
+  <string name="hdr_tooltip">Intensity of lighting effects such as realistically bright skies and dynamic exposure. 1.0 is the default, 0 is off, values between 0 and 1 are mixing Ambient with HDR.</string>
     <layout_stack name="outer_stack"
                   width="845"
                   height="275"
diff --git a/indra/newview/skins/default/xui/en/floater_bulk_upload.xml b/indra/newview/skins/default/xui/en/floater_bulk_upload.xml
new file mode 100644
index 0000000000..b2d03a5d04
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_bulk_upload.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater
+ can_resize="false"
+ show_title="false"
+ can_minimize="false"
+ can_close="false"
+ header_height="10"
+ bg_opaque_image="Window_NoTitle_Foreground"
+ bg_alpha_image="Window_NoTitle_Background"
+ height="207"
+ layout="topleft"
+ name="bulk_upload"
+ width="430">
+    <layout_stack
+      follows="all"
+      height="203"
+      layout="topleft"
+      left="8"
+      animate="false"
+      top="1"
+      orientation="vertical"
+      name="maint_layout"
+      width="421">
+        <layout_panel
+          follows="all"
+          height="27"
+          layout="topleft"
+          auto_resize="false"
+          visible="true"
+          name="count_panel">
+            <text
+             follows="left|top"
+             layout="topleft"
+             top="6"
+             left="20"
+             name="number_of_items"
+             height="20"
+             wrap="true">
+                Number of items to upload: [COUNT]
+            </text>
+        </layout_panel>
+        <layout_panel
+          follows="all"
+          height="37"
+          layout="topleft"
+          auto_resize="false"
+          visible="true"
+          name="warning_panel">
+            <text
+             name="textures_2k_warning"
+             follows="left|top"
+             layout="topleft"
+             top="6"
+             left="20"
+             height="30"
+             right="-20"
+             wrap="true">
+                By default, one or more selected textures will be scaled to 2048px.
+            </text>
+        </layout_panel>
+        <layout_panel
+          follows="all"
+          height="23"
+          layout="topleft"
+          auto_resize="false"
+          visible="true"
+          name="checkbox_panel">
+            <check_box
+             height="16"
+             left="20"
+             label="Scale textures to a maximum of 1024px"
+             layout="topleft"
+             name="upload_2k" />
+        </layout_panel>
+        <layout_panel
+          follows="all"
+          height="27"
+          layout="topleft"
+          auto_resize="false"
+          visible="true"
+          name="cost_panel">
+            <text
+             name="upload_cost"
+             follows="left|top"
+             layout="topleft"
+             font.style="BOLD"
+             top="6"
+             left="20"
+             height="20"
+             wrap="true">
+                Upload cost: L$[COST]
+            </text>
+        </layout_panel>
+        <layout_panel
+          follows="all"
+          height="29"
+          layout="topleft"
+          auto_resize="false"
+          visible="true"
+          name="buttoms_panel">
+            <button
+             follows="bottom|left|right"
+             height="23"
+             label="Upload"
+             layout="topleft"
+             mouse_opaque="false"
+             name="upload_btn"
+             top="1"
+             left="84"
+             width="120" />
+            <button
+             follows="bottom|left|right"
+             height="23"
+             label="Cancel"
+             layout="topleft"
+             left_pad="12"
+             top_delta="0"
+             mouse_opaque="false"
+             name="cancel_btn"
+             width="120" />
+        </layout_panel>
+        <layout_panel
+          follows="all"
+          height="40"
+          layout="topleft"
+          auto_resize="false"
+          visible="true"
+          name="link_panel">
+            <text
+             follows="left|top"
+             layout="topleft"
+             top="6"
+             left="20"
+             name="new_folder_textbox"
+             height="39"
+             parse_urls="true"
+             skip_link_underline="true"
+             wrap="true">
+How textures are scaled during upload:
+https://wiki.secondlife.com/wiki/Limits#All_Viewers
+            </text>
+        </layout_panel>
+    </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
index 223069ed0c..465580301e 100644
--- a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
+++ b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
@@ -9,6 +9,10 @@
  width="319">
 
   <floater.string
+    name="multiple_item_names">
+      Multiple items selected
+  </floater.string>
+  <floater.string
     name="title_item_thumbnail">
     CHANGE ITEM IMAGE
   </floater.string>
@@ -72,6 +76,22 @@
     height="256"
     width="256"
         />
+  <text
+   name="multiple_lbl"
+   font="SansSerifBig"
+   text_color="White"
+   halign="center"
+   valign="center"
+   use_ellipses="true"
+   follows="top|left"
+   layout="topleft"
+   height="256"
+   width="256"
+   top_delta="0"
+   left_delta="0"
+   visible =" false">
+      Multiple thumbnails
+  </text>
 
   <button
     follows="right|bottom"
diff --git a/indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml b/indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml
new file mode 100644
index 0000000000..b17d0aa5b6
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml
@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="true"
+ default_tab_group="1"
+ height="530"
+ width="256"
+ min_height="400"
+ min_width="200"
+ layout="topleft"
+ name="gltf asset editor"
+ title="[OBJECT_NAME]">
+    <floater.string name="floater_title" value="GLTF Scene Editor"/>
+    <floater.string name="scene_tittle" value="Scene"/>
+    <floater.string name="node_tittle" value="Node"/>
+    <floater.string name="mesh_tittle" value="Mesh"/>
+    <floater.string name="skin_tittle" value="Skin"/>
+
+    <layout_stack
+     name="main_layout"
+     orientation="vertical"
+     follows="all"
+     bottom="-1"
+     top="16"
+     left="5"
+     right="-1"
+     border_size="0">
+
+        <layout_panel
+         name="top_lp"
+         border="true"
+         bevel_style="in"
+         auto_resize="false"
+         user_resize="true"
+         visible="true"
+         height="200">
+            <panel
+             follows="all"
+             layout="topleft"
+             name="item_list_panel"
+             visible="true"
+             bottom="-1"
+             top="1"
+             left="5"
+             right="-1"/>
+        </layout_panel>
+
+        <layout_panel
+         name="transforms_panel"
+         border="true"
+         bevel_style="in"
+         auto_resize="true"
+         user_resize="true"
+         visible="true"
+         height="150">
+            <menu_button
+             menu_filename="menu_copy_paste_pos.xml"
+             follows="top|left"
+             height="11"
+             image_disabled="ClipboardSmallMenu_Disabled"
+             image_selected="ClipboardSmallMenu_Press"
+             image_unselected="ClipboardSmallMenu_Off"
+             layout="topleft"
+             left="4"
+             top="10"
+             name="clipboard_pos_btn"
+             tool_tip="Paste options"
+             width="19"/>
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             name="label position"
+             tool_tip="Position (meters)"
+             left_pad="8"
+             top_delta="0"
+             width="121">
+                Position (m)
+            </text>
+            <spinner
+             follows="left|top"
+             height="19"
+             increment="0.01"
+             initial_value="0"
+             label="X"
+             label_width="10"
+             layout="topleft"
+             left_delta="-27"
+             max_val="512"
+             min_val="-256"
+             name="Pos X"
+             text_enabled_color="1 0 0.3 .7"
+             top_pad="8"
+             width="87" />
+            <spinner
+             follows="left|top"
+             height="19"
+             increment="0.01"
+             initial_value="0"
+             label="Y"
+             label_width="10"
+             layout="topleft"
+             left_delta="0"
+             max_val="512"
+             min_val="-256"
+             name="Pos Y"
+             text_enabled_color="EmphasisColor"
+             top_pad="3"
+             width="87" />
+            <spinner
+             follows="left|top"
+             height="19"
+             increment="0.01"
+             initial_value="0"
+             label="Z"
+             label_width="10"
+             layout="topleft"
+             left_delta="0"
+             max_val="4096"
+             min_val="-32"
+             name="Pos Z"
+             text_enabled_color="0 0.8 1 .65"
+             top_pad="3"
+             width="87" />
+            <menu_button
+             menu_filename="menu_copy_paste_size.xml"
+             follows="top|left"
+             height="11"
+             image_disabled="ClipboardSmallMenu_Disabled"
+             image_selected="ClipboardSmallMenu_Press"
+             image_unselected="ClipboardSmallMenu_Off"
+             layout="topleft"
+             left_delta="0"
+             top_pad="13"
+             name="clipboard_size_btn"
+             tool_tip="Paste options"
+             width="19"/>
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_pad="8"
+             top_delta="0"
+             name="label size"
+             tool_tip="Size (meters)"
+             width="121">
+                Size (m)
+            </text>
+            <spinner
+             follows="left|top"
+             height="19"
+             increment="0.01"
+             initial_value="0"
+             label="X"
+             label_width="10"
+             layout="topleft"
+             left_delta="-27"
+             max_val="64"
+             min_val="0.01"
+             name="Scale X"
+             text_enabled_color="1 1 1 1"
+             top_pad="8"
+             width="87" />
+            <spinner
+             follows="left|top"
+             height="19"
+             increment="0.01"
+             initial_value="0"
+             label="Y"
+             label_width="10"
+             layout="topleft"
+             left_delta="0"
+             max_val="64"
+             min_val="0.01"
+             name="Scale Y"
+             text_enabled_color="1 1 1 1"
+             top_pad="3"
+             width="87" />
+            <spinner
+             follows="left|top"
+             height="19"
+             increment="0.01"
+             initial_value="0"
+             label="Z"
+             label_width="10"
+             layout="topleft"
+             left_delta="0"
+             max_val="64"
+             min_val="0.01"
+             name="Scale Z"
+             text_enabled_color="1 1 1 1"
+             top_pad="3"
+             width="87" />
+            <menu_button
+             menu_filename="menu_copy_paste_rot.xml"
+             follows="top|left"
+             height="11"
+             image_disabled="ClipboardSmallMenu_Disabled"
+             image_selected="ClipboardSmallMenu_Press"
+             image_unselected="ClipboardSmallMenu_Off"
+             layout="topleft"
+             left_delta="0"
+             top_pad="13"
+             name="clipboard_rot_btn"
+             tool_tip="Paste options"
+             width="19"/>
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_pad="8"
+             top_delta="0"
+             name="label rotation"
+             tool_tip="Rotation (degrees)"
+             width="121">
+                Rotation (°)
+            </text>
+            <spinner
+             decimal_digits="2"
+             follows="left|top"
+             height="19"
+             increment="1"
+             initial_value="0"
+             label="X"
+             label_width="10"
+             layout="topleft"
+             left_delta="-27"
+             max_val="9999"
+             min_val="-9999"
+             name="Rot X"
+             text_enabled_color="1 1 1 1"
+             top_pad="8"
+             width="87" />
+            <spinner
+             decimal_digits="2"
+             follows="left|top"
+             height="19"
+             increment="1"
+             initial_value="0"
+             label="Y"
+             label_width="10"
+             layout="topleft"
+             left_delta="0"
+             max_val="9999"
+             min_val="-9999"
+             name="Rot Y"
+             text_enabled_color="1 1 1 1"
+             top_pad="3"
+             width="87" />
+            <spinner
+             decimal_digits="2"
+             follows="left|top"
+             height="19"
+             increment="1"
+             initial_value="0"
+             label="Z"
+             label_width="10"
+             layout="topleft"
+             left_delta="0"
+             max_val="9999"
+             min_val="-9999"
+             name="Rot Z"
+             text_enabled_color="1 1 1 1"
+             top_pad="3"
+             width="87" />
+        </layout_panel>
+
+        <layout_panel
+         name="blank_panel"
+         border="true"
+         bevel_style="in"
+         auto_resize="true"
+         user_resize="true"
+         visible="false"
+         height="150">
+        </layout_panel>
+    </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 4df29c47de..176a2ca1a4 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -14,7 +14,7 @@
  reuse_instance="true"
  title="CONVERSATIONS"
  bottom="-50"
- right="-5"
+ left="5"
  width="450"
  min_width="38">
     <string
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 738d448f00..7b06bed0a3 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -341,7 +341,6 @@
                  name="emoji_recent_empty_text"
                  follows="top|left|right"
                  layout="topleft"
-                 auto_resize="false"
                  h_pad="20"
                  v_pad="10"
                  top="0"
diff --git a/indra/newview/skins/default/xui/en/floater_incoming_call.xml b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
index 169d4c9d24..2d8089ee35 100644
--- a/indra/newview/skins/default/xui/en/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
@@ -12,7 +12,7 @@
  width="550">
     <floater.string
      name="lifetime">
-        5
+        30
     </floater.string>
     <floater.string
      name="localchat">
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index 94c889f4e4..7bc81a1f79 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
-  height="400"
+  height="411"
   layout="topleft"
   name="prefs_graphics_advanced"
   help_topic="Preferences_Graphics_Advanced"
@@ -102,6 +102,22 @@
     width="65">
        Low
   </text>
+  <slider
+    control_name="RenderLocalLightCount"
+    decimal_digits="0"
+    follows="left|top"
+    height="16"
+    increment="1"
+    initial_value="256"
+    label="Max. nearby lights:"
+    label_width="185"
+    layout="topleft"
+    left="30"
+    min_val="0"
+    max_val="8192"
+    name="MaxLights"
+    top_delta="16"
+    width="336" />
 
   <check_box
     control_name="RenderVSyncEnable"
@@ -128,6 +144,42 @@
      Avatar
   </text>
 
+    <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="16"
+      layout="topleft"
+      left="30"
+      top_delta="16"
+      width="128"
+      name="AvatarComplexityModeLabel"
+      text_readonly_color="LabelDisabledColor">
+        Avatar display:
+    </text>
+
+    <combo_box
+     control_name="RenderAvatarComplexityMode"
+     height="18"
+     layout="topleft"
+     left_delta="130"
+     top_delta="0"
+     name="AvatarComplexityMode"
+     width="150">
+        <combo_box.item
+          label="Limit by complexity"
+          name="0"
+          value="0"/>
+        <combo_box.item
+          label="Always show friends"
+          name="1"
+          value="1"/>
+        <combo_box.item
+          label="Only show friends"
+          name="2"
+          value="2"/>
+    </combo_box>
+
   <slider
     control_name="IndirectMaxComplexity"
     tool_tip="Controls at what point a visually complex avatar is drawn as a JellyDoll"
@@ -493,7 +545,7 @@
   </text>
    <view_border
       bevel_style="in"
-      height="322"
+      height="357"
       layout="topleft"
       left="385"
       name="vert_border"
@@ -812,21 +864,21 @@
    name="HeroProbeUpdateRate"
    width="150">
     <combo_box.item
-      label="Every Frame"
-      name="0"
-      value="1"/>
+      label="Low"
+      name="6"
+      value="6"/>
     <combo_box.item
-      label="Every 2nd Frame"
+      label="Medium"
+      name="3"
+      value="3"/>
+    <combo_box.item
+      label="High"
       name="1"
       value="2"/>
     <combo_box.item
-      label="Every 3rd Frame"
-      name="2"
-      value="3"/>
-    <combo_box.item
-      label="Every 4th Frame"
-      name="3"
-      value="4"/>
+      label="Ultra"
+      name="0"
+      value="1"/>
   </combo_box>
   <!-- End of mirror settings -->
 
@@ -837,7 +889,7 @@
       layout="topleft"
       left="13"
       name="horiz_border"
-      top="338"
+      top="373"
       top_delta="5"
       width="774"/>
   <button
@@ -847,7 +899,7 @@
     layout="topleft"
     left="20"
     name="Defaults"
-    top_delta="20"
+    top_delta="7"
     width="210">
     <button.commit_callback
       function="Pref.HardwareDefaults" />
diff --git a/indra/newview/skins/default/xui/en/floater_region_restart_schedule.xml b/indra/newview/skins/default/xui/en/floater_region_restart_schedule.xml
new file mode 100644
index 0000000000..fd04acde35
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_region_restart_schedule.xml
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+  height="180"
+  layout="topleft"
+  name="floater_region_restart_schedule"
+  help_topic="Preferences_Graphics_Advanced"
+  single_instance="true"
+  save_rect="true"
+  title="REGION RESTART SCHEDULE"
+  width="300">
+
+<!-- This block shows Advanced Settings -->
+  <floater.string name="am_string">am</floater.string>
+  <floater.string name="pm_string">pm</floater.string>
+
+  <text
+    name="days_general"
+    type="string"
+    follows="left|top"
+    layout="topleft"
+    height="16"
+    top="15"
+    left="20"
+    width="328">
+     Restart the region on following days:
+  </text>
+
+  <check_box
+   name="s_chk"
+   label=""
+   tool_tip="Sunday"
+   follows="left|top"
+   layout="topleft"
+   height="20"
+   width="20"
+   left="60"
+   top_pad="5" />
+
+  <check_box
+   name="m_chk"
+   label=""
+   tool_tip="Monday"
+   follows="left|top"
+   layout="topleft"
+   height="20"
+   width="20"
+   left_pad="5"
+   top_delta="0" />
+
+  <check_box
+   name="t_chk"
+   label=""
+   tool_tip="Tuesday"
+   follows="left|top"
+   layout="topleft"
+   height="20"
+   width="20"
+   left_pad="5"
+   top_delta="0" />
+
+  <check_box
+   name="w_chk"
+   label=""
+   tool_tip="Wednesday"
+   follows="left|top"
+   layout="topleft"
+   height="20"
+   width="20"
+   left_pad="5"
+   top_delta="0" />
+
+  <check_box
+   name="r_chk"
+   label=""
+   tool_tip="Thursday"
+   follows="left|top"
+   layout="topleft"
+   height="20"
+   width="20"
+   left_pad="5"
+   top_delta="0" />
+
+  <check_box
+   name="f_chk"
+   label=""
+   tool_tip="Friday"
+   follows="left|top"
+   layout="topleft"
+   height="20"
+   width="20"
+   left_pad="5"
+   top_delta="0" />
+
+  <check_box
+   name="a_chk"
+   label=""
+   tool_tip="Saturday"
+   follows="left|top"
+   layout="topleft"
+   height="20"
+   width="20"
+   left_pad="5"
+   top_delta="0" />
+
+  <text
+   name="su_label"
+   type="string"
+   follows="left|top"
+   layout="topleft"
+   halign="center"
+   height="16"
+   top_pad="5"
+   left="57"
+   width="25">
+     Su
+  </text>
+
+  <text
+   name="mo_label"
+   type="string"
+   follows="left|top"
+   layout="topleft"
+   halign="center"
+   height="16"
+   top_delta="0"
+   left_pad="0"
+   width="25">
+     Mo
+  </text>
+
+  <text
+   name="tu_label"
+   type="string"
+   follows="left|top"
+   layout="topleft"
+   halign="center"
+   height="16"
+   top_delta="0"
+   left_pad="0"
+   width="25">
+     Tu
+  </text>
+
+  <text
+   name="we_label"
+   type="string"
+   follows="left|top"
+   layout="topleft"
+   halign="center"
+   height="16"
+   top_delta="0"
+   left_pad="1"
+   width="25">
+     We
+  </text>
+
+  <text
+   name="th_label"
+   type="string"
+   follows="left|top"
+   layout="topleft"
+   halign="center"
+   height="16"
+   top_delta="0"
+   left_pad="0"
+   width="25">
+     Th
+  </text>
+
+  <text
+   name="fr_label"
+   type="string"
+   follows="left|top"
+   layout="topleft"
+   halign="center"
+   height="16"
+   top_delta="0"
+   left_pad="0"
+   width="25">
+     Fr
+  </text>
+
+  <text
+   name="sa_label"
+   type="string"
+   follows="left|top"
+   layout="topleft"
+   halign="center"
+   height="16"
+   top_delta="0"
+   left_pad="0"
+   width="25">
+     Sa
+  </text>
+
+  <text
+   name="at_label"
+   type="string"
+   follows="left|top"
+   layout="topleft"
+   halign="right"
+   height="16"
+   top_pad="15"
+   left="30"
+   width="40">
+     at
+  </text>
+  <line_editor
+   name="hours_edt"
+   max_length_bytes="2"
+   follows="left|top"
+   layout="topleft"
+   commit_on_focus_lost="true"
+   height="23"
+   width="40"
+   left_pad="4"
+   top_delta="-5"/>
+  <text
+   name="separator_label"
+   type="string"
+   follows="left|top"
+   layout="topleft"
+   halign="center"
+   height="16"
+   top_delta="5"
+   left_pad="0"
+   width="12">
+     :
+  </text>
+  <line_editor
+   name="minutes_edt"
+   max_length_bytes="2"
+   follows="left|top"
+   layout="topleft"
+   commit_on_focus_lost="true"
+   height="23"
+   width="40"
+   left_pad="0"
+   top_delta="-5"/>
+  <button
+   name="am_pm_btn"
+   label="am"
+   follows="left|top"
+   layout="topleft"
+   height="23"
+   width="40"
+   left_pad="1"
+   top_delta="0"/>
+  <text
+   name="utc_label"
+   type="string"
+   follows="left|top"
+   layout="topleft"
+   height="16"
+   top_delta="5"
+   left_pad="5"
+   width="22">
+     UTC
+  </text>
+  <button
+   name="save_btn"
+   label="Save"
+   follows="top|left"
+   layout="topleft"
+   top="145"
+   left="25"
+   height="25"
+   width="110"/>
+  <button
+   name="cancel_btn"
+   label="Cancel"
+   follows="bottom|right"
+   layout="topleft"
+   left_pad="20"
+   top_delta="0"
+   height="25"
+   width="110"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_settings_color.xml b/indra/newview/skins/default/xui/en/floater_settings_color.xml
new file mode 100644
index 0000000000..0722677f1d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_settings_color.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater
+    legacy_header_height="18"
+    can_minimize="false"
+    height="360"
+    min_height="367"
+    layout="topleft"
+    name="settings_color"
+    help_topic="settings_color"
+    title="COLOR SETTINGS"
+    reuse_instance="true"
+    can_resize="true"
+    min_width="550"
+    width="570">
+    <filter_editor
+        follows="left|top|right"
+        height="23"
+        layout="topleft"
+        left="10"
+        right="-10"
+        label="Enter search text"
+        max_length_chars="300"
+        name="filter_input"
+        text_pad_left="10"
+        top="30" />
+    <scroll_list
+        column_padding="0"
+        draw_heading="true"
+        draw_stripes="false"
+        heading_height="23"
+        height="266"
+        layout="topleft"
+        search_column="1"
+        sort_column="1"
+        left="10"
+        follows="left|top|bottom"
+        name="setting_list"
+        top_pad="2"
+        width="300">
+        <scroll_list.columns
+            name="changed_color"
+            relative_width="0.05" />
+        <scroll_list.columns
+            label="Color"
+            name="color" />
+    </scroll_list>
+    <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="16"
+        layout="topleft"
+        name="color_name_txt"
+        font="SansSerifSmallBold"
+        top_delta="8"
+        left_pad="10"
+        visible="true"
+        use_ellipses="true"
+        text_color="White"
+        width="240">
+        Color name
+    </text>
+    <color_swatch
+        top_pad="0"
+        left_delta="0"
+        follows="top|left"
+        can_apply_immediately="true"
+        height="180"
+        name="color_swatch"
+        visible="true"
+        layout="topleft"
+        width="240">
+        <color_swatch.commit_callback
+            function="CommitSettings" />
+    </color_swatch>
+    <spinner
+        height="20"
+        label="Alpha"
+        layout="topleft"
+        follows="top|left"
+        left_delta="0"
+        min_val="0"
+        max_val="1"
+        decimal_digits="3"
+        name="alpha_spinner"
+        top_pad="5"
+        visible="true"
+        width="120">
+        <spinner.commit_callback
+            function="CommitSettings" />
+    </spinner>
+    <button
+        height="22"
+        label="Reset to default"
+        follows="left|top"
+        layout="topleft"
+        left_delta="0"
+        name="default_btn"
+        visible="true"
+        top_pad="15"
+        width="150">
+        <button.commit_callback
+            function="ClickDefault" />
+    </button>
+    <check_box
+        control_name="ColorSettingsHideDefault"
+        height="16"
+        initial_value="true"
+        label="Show changed colors only"
+        layout="topleft"
+        top_pad="10"
+        left="10"
+        follows="left|bottom"
+        name="hide_default"
+        width="330">
+    </check_box>
+</floater>
+\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index 7efa81d263..b0b818cde5 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -14,6 +14,9 @@
  single_instance="true"
  title="WORLD MAP"
  width="650">
+  <string name="UnnamedParcel">
+    (Unnamed Parcel)
+  </string>
   <string
    name="collapse_icon"
    value="map_ui_collapse_icon.png"/>
diff --git a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
index c11f1c88cb..16907d3577 100644
--- a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
@@ -426,6 +426,234 @@
   <menu_item_separator
    layout="topleft"
    name="Subfolder Separator" />
+  <menu
+   label="Create new"
+   layout="topleft"
+   name="create_new">
+      <menu_item_call
+       label="New Folder"
+       layout="topleft"
+       name="New Folder">
+          <menu_item_call.on_click
+           function="Inventory.DoCreate"
+           parameter="category" />
+      </menu_item_call>
+      <menu_item_call
+       label="New Script"
+       layout="topleft"
+       name="New Script">
+          <menu_item_call.on_click
+           function="Inventory.DoCreate"
+           parameter="lsl" />
+      </menu_item_call>
+      <menu_item_call
+       label="New Notecard"
+       layout="topleft"
+       name="New Note">
+          <menu_item_call.on_click
+           function="Inventory.DoCreate"
+           parameter="notecard" />
+      </menu_item_call>
+      <menu_item_call
+       label="New Gesture"
+       layout="topleft"
+       name="New Gesture">
+          <menu_item_call.on_click
+           function="Inventory.DoCreate"
+           parameter="gesture" />
+      </menu_item_call>
+      <menu_item_call
+       label="New Material"
+       layout="topleft"
+       name="New Material">
+          <menu_item_call.on_click
+           function="Inventory.DoCreate"
+           parameter="material" />
+          <menu_item_call.on_enable
+           function="Inventory.MaterialsEnabled" />
+      </menu_item_call>
+      <menu
+       label="New Clothes"
+       layout="topleft"
+       name="New Clothes">
+          <menu_item_call
+           label="New Shirt"
+           layout="topleft"
+           name="New Shirt">
+              <menu_item_call.on_click
+               function="Inventory.DoCreate"
+               parameter="shirt" />
+          </menu_item_call>
+          <menu_item_call
+           label="New Pants"
+           layout="topleft"
+           name="New Pants">
+              <menu_item_call.on_click
+               function="Inventory.DoCreate"
+               parameter="pants" />
+          </menu_item_call>
+          <menu_item_call
+           label="New Shoes"
+           layout="topleft"
+           name="New Shoes">
+              <menu_item_call.on_click
+               function="Inventory.DoCreate"
+               parameter="shoes" />
+          </menu_item_call>
+          <menu_item_call
+           label="New Socks"
+           layout="topleft"
+           name="New Socks">
+              <menu_item_call.on_click
+               function="Inventory.DoCreate"
+               parameter="socks" />
+          </menu_item_call>
+          <menu_item_call
+           label="New Jacket"
+           layout="topleft"
+           name="New Jacket">
+              <menu_item_call.on_click
+               function="Inventory.DoCreate"
+               parameter="jacket" />
+          </menu_item_call>
+          <menu_item_call
+           label="New Skirt"
+           layout="topleft"
+           name="New Skirt">
+              <menu_item_call.on_click
+               function="Inventory.DoCreate"
+               parameter="skirt" />
+          </menu_item_call>
+          <menu_item_call
+           label="New Gloves"
+           layout="topleft"
+           name="New Gloves">
+              <menu_item_call.on_click
+               function="Inventory.DoCreate"
+               parameter="gloves" />
+          </menu_item_call>
+          <menu_item_call
+           label="New Undershirt"
+           layout="topleft"
+           name="New Undershirt">
+              <menu_item_call.on_click
+               function="Inventory.DoCreate"
+               parameter="undershirt" />
+          </menu_item_call>
+          <menu_item_call
+           label="New Underpants"
+           layout="topleft"
+           name="New Underpants">
+              <menu_item_call.on_click
+               function="Inventory.DoCreate"
+               parameter="underpants" />
+          </menu_item_call>
+          <menu_item_call
+           label="New Alpha Mask"
+           layout="topleft"
+           name="New Alpha Mask">
+              <menu_item_call.on_click
+               function="Inventory.DoCreate"
+               parameter="alpha" />
+            </menu_item_call>
+          <menu_item_call
+           label="New Tattoo"
+           layout="topleft"
+           name="New Tattoo">
+              <menu_item_call.on_click
+               function="Inventory.DoCreate"
+               parameter="tattoo" />
+          </menu_item_call>
+          <menu_item_call
+           label="New Universal"
+           layout="topleft"
+           name="New Universal">
+              <menu_item_call.on_click
+               function="Inventory.DoCreate"
+               parameter="universal" />
+          </menu_item_call>
+          <menu_item_call
+           label="New Physics"
+           layout="topleft"
+           name="New Physics">
+              <menu_item_call.on_click
+               function="Inventory.DoCreate"
+               parameter="physics" />
+          </menu_item_call>
+      </menu>
+      <menu
+       label="New Body Parts"
+       layout="topleft"
+       name="New Body Parts">
+          <menu_item_call
+           label="New Shape"
+           layout="topleft"
+           name="New Shape">
+              <menu_item_call.on_click
+               function="Inventory.DoCreate"
+               parameter="shape" />
+          </menu_item_call>
+          <menu_item_call
+           label="New Skin"
+           layout="topleft"
+           name="New Skin">
+              <menu_item_call.on_click
+               function="Inventory.DoCreate"
+               parameter="skin" />
+          </menu_item_call>
+          <menu_item_call
+           label="New Hair"
+           layout="topleft"
+           name="New Hair">
+              <menu_item_call.on_click
+               function="Inventory.DoCreate"
+               parameter="hair" />
+          </menu_item_call>
+          <menu_item_call
+           label="New Eyes"
+           layout="topleft"
+           name="New Eyes">
+              <menu_item_call.on_click
+               function="Inventory.DoCreate"
+               parameter="eyes" />
+          </menu_item_call>
+      </menu>
+      <menu
+       label="New Settings"
+       layout="topleft"
+       name="New Settings">
+          <menu_item_call
+           label="New Sky"
+           layout="topleft"
+           name="New Sky">
+              <menu_item_call.on_click
+               function="Inventory.DoCreate"
+               parameter="sky"/>
+              <menu_item_call.on_enable
+               function="Inventory.EnvironmentEnabled" />
+          </menu_item_call>
+          <menu_item_call
+           label="New Water"
+           layout="topleft"
+           name="New Water">
+              <menu_item_call.on_click
+               function="Inventory.DoCreate"
+               parameter="water"/>
+              <menu_item_call.on_enable
+               function="Inventory.EnvironmentEnabled" />
+          </menu_item_call>
+          <menu_item_call
+           label="New Day Cycle"
+           layout="topleft"
+           name="New Day Cycle">
+              <menu_item_call.on_click
+               function="Inventory.DoCreate"
+               parameter="daycycle"/>
+              <menu_item_call.on_enable
+               function="Inventory.EnvironmentEnabled" />
+          </menu_item_call>
+      </menu>
+  </menu>
   <menu_item_call
    label="Create folder from selected"
    layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index a71cbde21b..1d1b81e31a 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -149,6 +149,13 @@
              function="Advanced.ShowDebugSettings"
              parameter="all" />
         </menu_item_call>
+        <menu_item_call
+         label="Show Color settings"
+         name="Color Settings">
+            <menu_item_call.on_click
+             function="Floater.Toggle"
+             parameter="settings_color" />
+        </menu_item_call>
         <menu_item_separator />
         <menu_item_call
          label="XUI Preview Tool"
diff --git a/indra/newview/skins/default/xui/en/menu_nearby_media.xml b/indra/newview/skins/default/xui/en/menu_nearby_media.xml
new file mode 100644
index 0000000000..7c91241a19
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_nearby_media.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu
+     name="menu_nearby_media"
+     left="0"
+     bottom="0"
+     visible="false"
+     mouse_opaque="false">
+    <menu_item_call
+     label="Copy Url"
+     name="copy_url">
+        <menu_item_call.on_click
+         function="SelectedMediaCtrl.Action"
+         parameter="copy_url" />
+    </menu_item_call>
+    <menu_item_call
+     label="Copy Data"
+     name="copy_data">
+        <menu_item_call.on_click
+         function="SelectedMediaCtrl.Action"
+         parameter="copy_data" />
+        <menu_item_call.on_visible
+         function="SelectedMediaCtrl.Visible"
+         parameter="copy_data" />
+    </menu_item_call>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index cbd38b1db8..2df581fa2c 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -173,6 +173,8 @@
         function="Object.Take"/>
     <menu_item_call.on_enable
         function="Object.VisibleTake"/>
+    <menu_item_call.on_visible
+        function="Object.VisibleTakeSingle"/>
   </menu_item_call>
   <menu_item_call
       enabled="false"
@@ -182,6 +184,52 @@
         function="Tools.TakeCopy" />
     <menu_item_call.on_enable
         function="Tools.EnableTakeCopy" />
+    <menu_item_call.on_visible
+        function="Object.VisibleTakeSingle"/>
+  </menu_item_call>
+  <menu_item_call
+      label="Take as combined item"
+      layout="topleft"
+      name="Take combined">
+      <menu_item_call.on_click
+        function="Object.Take"/>
+      <menu_item_call.on_enable
+        function="Object.VisibleTake"/>
+      <menu_item_call.on_visible
+        function="Object.VisibleTakeMultiple"/>
+  </menu_item_call>
+  <menu_item_call
+      enabled="false"
+      label="Take copy as combined item"
+      name="Take Copy combined">
+      <menu_item_call.on_click
+        function="Tools.TakeCopy" />
+      <menu_item_call.on_enable
+        function="Tools.EnableTakeCopy" />
+      <menu_item_call.on_visible
+        function="Object.VisibleTakeMultiple"/>
+  </menu_item_call>
+  <menu_item_call
+      label="Take as separate items"
+      layout="topleft"
+      name="Take Separate">
+      <menu_item_call.on_click
+        function="Object.TakeSeparate"/>
+      <menu_item_call.on_enable
+        function="Object.EnableTakeMultiple"/>
+      <menu_item_call.on_visible
+        function="Object.VisibleTakeMultiple"/>
+  </menu_item_call>
+  <menu_item_call
+      label="Take copies as separate items"
+      layout="topleft"
+       name="Take Copy Separate">
+       <menu_item_call.on_click
+        function="Object.TakeSeparateCopy"/>
+       <menu_item_call.on_enable
+        function="Tools.EnableCopySeparate"/>
+       <menu_item_call.on_visible
+        function="Object.VisibleTakeMultiple"/>
   </menu_item_call>
   <menu_item_call
       enabled="false"
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
index 63185b537c..61738e73db 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
@@ -48,6 +48,9 @@
      name="share">
         <on_click
          function="Avatar.Share" />
+        <on_enable
+         function="Avatar.EnableItem"
+         parameter="can_share" />
     </menu_item_call>
     <menu_item_call
      enabled="false"
@@ -56,6 +59,9 @@
      name="pay">
         <on_click
          function="Avatar.Pay" />
+        <on_enable
+         function="Avatar.EnableItem"
+         parameter="can_pay" />
     </menu_item_call>
     <menu_item_call
     label="Offer Teleport"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index f3d44cf647..40f3e51fca 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -561,42 +561,6 @@
              parameter="conversation" />
         </menu_item_check>
         <menu_item_separator/>
-        <menu
-         label="Voice morphing"
-         name="VoiceMorphing"
-         visibility_control="VoiceMorphingEnabled">
-            <menu_item_check
-             label="No voice morphing"
-             name="NoVoiceMorphing">
-                <menu_item_check.on_check
-                 function="Communicate.VoiceMorphing.NoVoiceMorphing.Check" />
-                <menu_item_check.on_click
-                 function="Communicate.VoiceMorphing.NoVoiceMorphing.Click" />
-            </menu_item_check>
-            <menu_item_separator/>
-            <menu_item_check
-             label="Preview..."
-             name="Preview">
-                <menu_item_check.on_check
-                 function="Floater.Visible"
-                 parameter="voice_effect" />
-                <menu_item_check.on_click
-                 function="Floater.Toggle"
-                 parameter="voice_effect" />
-            </menu_item_check>
-            <menu_item_call
-             label="Subscribe..."
-             name="Subscribe">
-                <menu_item_call.on_click
-                 function="Communicate.VoiceMorphing.Subscribe" />
-            </menu_item_call>
-            <menu_item_call
-             label="Premium perk..."
-             name="PremiumPerk">
-                <menu_item_call.on_click
-                 function="Communicate.VoiceMorphing.PremiumPerk" />
-            </menu_item_call>
-        </menu>
         <menu_item_check
          label="Gestures..."
          name="Gestures"
@@ -2858,6 +2822,78 @@ function="World.EnvPreset"
                 parameter="mem_leaking" />
                </menu_item_call>
         </menu>
+      <menu
+         create_jump_keys="true"
+         label="GLTF"
+         name="GLTF"
+         tear_off="true">
+        <menu_item_call
+         label="Open..."
+         name="Open...">
+            <!--<menu_item_call.on_enable
+             function="EnableGLTF"/>-->
+          <menu_item_call.on_click
+           function="Advanced.ClickGLTFOpen" />
+        </menu_item_call>
+        <menu_item_call
+         label="Save As..."
+         name="Save As...">
+          <menu_item_call.on_enable
+             function="EnableGLTFSaveAs"/>
+          <menu_item_call.on_click
+           function="Advanced.ClickGLTFSaveAs" />
+        </menu_item_call>
+        <menu_item_call
+         label="Upload..."
+         name="Upload...">
+          <menu_item_call.on_enable
+             function="EnableGLTFUpload"/>
+          <menu_item_call.on_click
+           function="Advanced.ClickGLTFUpload" />
+        </menu_item_call>
+        <menu_item_call
+         label="Edit..."
+         name="Edit...">
+          <menu_item_call.on_enable
+             function="EnableGLTFUpload"/>
+          <menu_item_call.on_click
+           function="Advanced.ClickGLTFEdit" />
+        </menu_item_call>
+      </menu>
+      <menu
+         create_jump_keys="true"
+         label="Video"
+         name="Video"
+         tear_off="true">
+        <menu_item_call
+         label="1080x1920"
+         name="1080x1920">
+          <menu_item_call.on_click
+           function="Advanced.ClickResizeWindow"
+            parameter="1080x1920"/>
+        </menu_item_call>
+        <menu_item_call
+         label="1920x1080"
+         name="1920x1080">
+          <menu_item_call.on_click
+           function="Advanced.ClickResizeWindow"
+            parameter="1920x1080"/>
+        </menu_item_call>
+        <menu_item_call
+         label="1280x720"
+         name="1280x720">
+          <menu_item_call.on_click
+           function="Advanced.ClickResizeWindow"
+            parameter="1280x720"/>
+          </menu_item_call>
+        <menu_item_call
+          label="720x1280"
+         name="720x1280">
+          <menu_item_call.on_click
+           function="Advanced.ClickResizeWindow"
+            parameter="720x1280"/>
+          </menu_item_call>
+      </menu>
         <menu
          create_jump_keys="true"
          label="Render Tests"
@@ -2910,12 +2946,6 @@ function="World.EnvPreset"
             <menu_item_call.on_click
              function="Advanced.ClickHDRIPreview" />
           </menu_item_call>
-          <menu_item_call
-           label="GLTF Scene Preview"
-           name="GLTF Scene Preview">
-            <menu_item_call.on_click
-             function="Advanced.ClickGLTFScenePreview" />
-          </menu_item_call>
         </menu>
       <menu
         create_jump_keys="true"
@@ -3405,13 +3435,6 @@ function="World.EnvPreset"
             <menu_item_call.on_click
              function="Advanced.ClearShaderCache" />
           </menu_item_call>
-          <menu_item_call
-            enabled="true"
-            label="Rebuild Terrain"
-            name="Rebuild Terrain">
-            <menu_item_call.on_click
-             function="Advanced.RebuildTerrain" />
-          </menu_item_call>
           <menu_item_separator />
           <menu_item_call
             enabled="true"
@@ -3632,6 +3655,37 @@ function="World.EnvPreset"
                  function="Advanced.ResetInterestLists" />
 			</menu_item_call>
 		</menu>
+        <!-- terrain -->
+        <menu
+         create_jump_keys="true"
+         label="Terrain"
+         name="DevelopTerrain"
+         tear_off="true">
+            <menu_item_call
+              enabled="true"
+              label="Rebuild Terrain"
+              name="Rebuild Terrain">
+              <menu_item_call.on_click
+               function="Advanced.RebuildTerrain" />
+            </menu_item_call>
+
+            <menu_item_separator/>
+
+            <menu_item_call
+              enabled="true"
+              label="Create Local Paintmap"
+              name="Create Local Paintmap">
+              <menu_item_call.on_click
+               function="Advanced.TerrainCreateLocalPaintMap" />
+            </menu_item_call>
+            <menu_item_call
+              enabled="true"
+              label="Delete Local Paintmap"
+              name="Delete Local Paintmap">
+              <menu_item_call.on_click
+               function="Advanced.TerrainDeleteLocalPaintMap" />
+            </menu_item_call>
+		</menu>
         <menu
          create_jump_keys="true"
          label="UI"
@@ -3800,6 +3854,13 @@ function="World.EnvPreset"
          name="XUI"
          tear_off="true">
             <menu_item_call
+             label="Show Color settings"
+             name="Color Settings">
+                <menu_item_call.on_click
+                 function="Floater.Toggle"
+                 parameter="settings_color" />
+            </menu_item_call>
+            <menu_item_call
                label="Reload Color Settings"
                name="Reload Color Settings">
               <menu_item_call.on_click
@@ -3936,6 +3997,26 @@ function="World.EnvPreset"
                      function="ToggleControl"
                      parameter="AllowSelectAvatar" />
                 </menu_item_check>
+                <menu_item_check
+                 label="Disable Look At Animation"
+                 name="Disable Look At Animation">
+                    <menu_item_check.on_check
+                     function="CheckControl"
+                     parameter="DisableLookAtAnimation" />
+                    <menu_item_check.on_click
+                     function="ToggleControl"
+                     parameter="DisableLookAtAnimation" />
+                </menu_item_check>
+                <menu_item_check
+                 label="Render Only Friends"
+                 name="Render Only Friends">
+                    <menu_item_check.on_check
+                     function="CheckControl"
+                     parameter="RenderAvatarFriendsOnly" />
+                    <menu_item_check.on_click
+                     function="ToggleControl"
+                     parameter="RenderAvatarFriendsOnly" />
+                </menu_item_check>
             </menu>
             <menu
              create_jump_keys="true"
@@ -4033,6 +4114,16 @@ function="World.EnvPreset"
                  function="Advanced.ToggleDebugCharacterVis" />
             </menu_item_check>
             <menu_item_check
+             label="Debug Character Rez State"
+             name="Debug Character Rez State">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="NameTagDebugAVRezState" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="NameTagDebugAVRezState" />
+            </menu_item_check>
+            <menu_item_check
              label="Show Collision Skeleton"
              name="Show Collision Skeleton">
                 <menu_item_check.on_check
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b9d0ef0cc7..91b137b75f 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3032,6 +3032,15 @@ This is usually a temporary failure. Please customize and save the wearable agai
   </notification>
 
   <notification
+   icon="notifytip.tga"
+   name="OutOfDiskSpace"
+   type="notifytip">
+The system is out of disk space. You will need to free up some space on your computer or clear the cache.
+<tag>fail</tag>
+    <unique/>
+  </notification>
+
+  <notification
    icon="alertmodal.tga"
    name="YouHaveBeenLoggedOut"
    type="alertmodal">
@@ -4254,6 +4263,20 @@ Can&apos;t change appearance until clothing and shape are loaded.
 
   <notification
    icon="alertmodal.tga"
+   name="UsavedWearableChanges"
+   type="alertmodal">
+You have unsaved changes.
+      <tag>group</tag>
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Confirm before I discard unsaved wearable changes"
+     name="okcancelignore"
+     notext="Keep Editing"
+     yestext="Discard"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
    name="ClassifiedMustBeAlphanumeric"
    type="alertmodal">
 The name of your classified must start with a letter from A to Z or a number.  No punctuation is allowed.
@@ -6267,7 +6290,7 @@ Are you sure you want to delete them?
      notext="Cancel"
      yestext="OK"/>
   </notification>
-    
+
   <notification
    icon="alertmodal.tga"
    name="DeleteWornItems"
@@ -6342,6 +6365,17 @@ You must replace those layers before deleting them.
      yestext="OK"/>
   </notification>
 
+    <notification
+     icon="alertmodal.tga"
+     name="ThumbnailSelectionTooLarge"
+     type="alertmodal">
+        <unique/>
+        You can only modify up to 50 thumbnails at a time.
+        <usetemplate
+         name="okbutton"
+         yestext="OK"/>
+    </notification>
+
   <notification
      icon="alertmodal.tga"
      name="ConfirmUnlink"
@@ -8831,6 +8865,21 @@ New Voice Morphs are available!
   </notification>
 
   <notification
+    icon="alertmodal.tga"
+    name="VoiceEffectsNotSupported"
+    sound="UISndAlert"
+    persist="true"
+    type="alertmodal">
+Voice Morphs are not supported by this viewer.
+For more information about other voice morph tools, see [[FAQ_URL] this article].
+    <usetemplate
+        ignoretext="Warn me about voice morph not being supported"
+        name="okignore"
+        yestext="OK"/>
+    <tag>voice</tag>
+  </notification>
+
+  <notification
    icon="notifytip.tga"
    name="Cannot enter parcel: not a group member"
    type="notifytip">
@@ -9035,17 +9084,6 @@ Your voice has been muted by moderator.
           name="okbutton"
           yestext="OK"/>
     </notification>
-
-   <notification
-    icon="alertmodal.tga"
-    name="BulkUploadCostConfirmation"
-    type="alertmodal">
-This will upload [COUNT] items at a total cost of L$[COST]. Do you wish to continue with the upload?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="Upload"/>
-   </notification>
   
    <notification
     icon="alertmodal.tga"
@@ -12450,7 +12488,7 @@ are wearing now.
 
   <notification
    icon="alertmodal.tga"
-   name="GLTFPreviewSelection"
+   name="GLTFOpenSelection"
    type="alert">
     You must select an object to act as a handle to the GLTF asset you are previewing.
     <tag>fail</tag>
@@ -12459,4 +12497,59 @@ are wearing now.
       yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="GLTFLoadFailed"
+   type="alert">
+    Failed to load GLTF file.  See log for details.
+    <tag>fail</tag>
+    <usetemplate
+      name="okbutton"
+      yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GLTFSaveFailed"
+   type="alert">
+    Failed to save GLTF file.  See log for details.
+    <tag>fail</tag>
+    <usetemplate
+      name="okbutton"
+      yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GLTFSaveSelection"
+   type="alert">
+    You must select an object that has a GLTF asset associated with it.
+    <tag>fail</tag>
+    <usetemplate
+      name="okbutton"
+      yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GLTFUploadSelection"
+   type="alert">
+    You must select an object that has local-only GLTF asset associated with it.
+    <tag>fail</tag>
+    <usetemplate
+      name="okbutton"
+      yestext="OK"/>
+  </notification>
+
+  <notification
+ icon="alertmodal.tga"
+ name="GLTFUploadInProgress"
+ type="alert">
+    Upload is currently in progress.  Please try again later.
+    <tag>fail</tag>
+    <usetemplate
+      name="okbutton"
+      yestext="OK"/>
+  </notification>
+
 </notifications>
diff --git a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
index 30fee7361f..ab0e447028 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
@@ -33,7 +33,6 @@
       top="0"
       width="313" >
        <check_box
-        control_name="LowerAlphaTextureInvisible"
         follows="left|top"
         height="16"
         layout="topleft"
@@ -58,7 +57,6 @@
        </texture_picker>
 
        <check_box
-        control_name="UpperAlphaTextureInvisible"
         follows="left|top"
         height="16"
         layout="topleft"
@@ -83,7 +81,6 @@
        </texture_picker>
 
        <check_box
-        control_name="HeadAlphaTextureInvisible"
         follows="left|top"
         height="16"
         layout="topleft"
@@ -108,7 +105,6 @@
        </texture_picker>
 
        <check_box
-        control_name="Eye AlphaTextureInvisible"
         follows="left|top"
         height="16"
         layout="topleft"
@@ -133,7 +129,6 @@
        </texture_picker>
 
        <check_box
-        control_name="HairAlphaTextureInvisible"
         follows="left|top"
         height="16"
         layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_performance_nearby.xml b/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
index ca961747c4..4409feb23a 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
@@ -135,18 +135,41 @@
     name="exceptions_btn"
     width="100">
   </button>
-  <check_box
-    control_name="AlwaysRenderFriends"
+
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
     height="16"
-    initial_value="true"
-    label="Always display friends in full detail"
-    label_text.text_color="White"
     layout="topleft"
-    name="display_friends"
-    top_pad="3"
     left="18"
-    width="256">
-  </check_box>
+    top_pad="3"
+    name="AvatarComplexityModeLabel"
+    text_readonly_color="LabelDisabledColor"
+    width="128">
+      Avatar display:
+  </text>
+  <combo_box
+   control_name="RenderAvatarComplexityMode"
+   height="23"
+   layout="topleft"
+   left_delta="130"
+   top_delta="-4"
+   name="AvatarComplexityMode"
+   width="150">
+       <combo_box.item
+        label="Limit by complexity"
+        name="0"
+        value="0"/>
+       <combo_box.item
+        label="Always show friends"
+        name="1"
+        value="1"/>
+       <combo_box.item
+        label="Only show friends"
+        name="2"
+        value="2"/>
+  </combo_box>
   <view_border
     bevel_style="in"
     height="0"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index adc0337edd..5d347397bf 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -242,6 +242,41 @@
     <button.commit_callback
       function="Pref.AutoAdjustments"/>
   </button>
+
+    <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="16"
+      layout="topleft"
+      left="30"
+      top_delta="42"
+      width="128"
+      name="AvatarComplexityModeLabel"
+      text_readonly_color="LabelDisabledColor">
+        Avatar display:
+    </text>
+    <combo_box
+     control_name="RenderAvatarComplexityMode"
+     height="23"
+     layout="topleft"
+     left_delta="130"
+     top_delta="-4"
+     name="AvatarComplexityMode"
+     width="150">
+        <combo_box.item
+         label="Limit by complexity"
+         name="0"
+         value="0"/>
+        <combo_box.item
+         label="Always show friends"
+         name="1"
+         value="1"/>
+        <combo_box.item
+         label="Only show friends"
+         name="2"
+         value="2"/>
+    </combo_box>
   
   <slider
     control_name="IndirectMaxComplexity"
@@ -250,7 +285,7 @@
     height="16"
     initial_value="101"
     increment="1"
-    label="Avatar Maximum Complexity:"
+    label="Avatar maximum complexity:"
     label_width="165"
     layout="topleft"
     left="30"
@@ -258,7 +293,7 @@
     max_val="101"
     name="IndirectMaxComplexity"
     show_text="false"
-    top_delta="40"
+    top_delta="28"
     width="300">
     <slider.commit_callback
       function="Pref.UpdateIndirectMaxComplexity"
@@ -277,32 +312,7 @@
     width="65">
        0
   </text>
-<text
-type="string"
-length="1"
-follows="left|top"
-height="16"
-layout="topleft"
-left_delta="68"
-name="IndirectMaxComplexityLink"
-mouse_opaque="false"
-top_delta="0"
-width="120">
-[https://community.secondlife.com/t5/Featured-News/Why-are-all-these-people-made-of-colored-jelly/ba-p/3031255 What's this?]
-</text>
 
-
-  <check_box
-    control_name="AlwaysRenderFriends"
-    height="16"
-    initial_value="true"
-    label="Always Render Friends"
-    layout="topleft"
-    left="30"
-    name="AlwaysRenderFriends"
-    top_delta="24"
-    width="256">
-  </check_box>
   <button
     height="23"
     label="Exceptions..."
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index 7eaaaee536..eb38f8bff3 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -340,7 +340,7 @@
    follows="left|top"
    top_delta="-6"
    layout="topleft"
-   left_pad="20"
+   left_pad="10"
    width="360"
    height="40"
    name="media_ear_location">
@@ -422,7 +422,7 @@
    control_name="VoiceEarLocation"
    follows="left|top"
    layout="topleft"
-   left_pad="20"
+   left_pad="10"
    top_delta="-6"
    width="360"
    height="40"
@@ -455,11 +455,21 @@
    top_pad="10" 
    width="237"/>
   <check_box
+   control_name="VoiceEchoCancellation"
+   height="15"
+   tool_tip="Check to enable voice echo cancellation"
+   label="Echo Cancellation"
+   layout="topleft"
+   left="260"
+   name="enable_echo_cancellation"
+   top_pad="-15"
+   width="200"/>
+  <check_box
    follows="top|left"
    enabled_control="EnableVoiceChat"
    control_name="PushToTalkToggle"
    height="15"
-   label="Toggle speak on/off when I press button in toolbar"
+   label="Toggle speak on/off with toolbar button"
    layout="topleft"
    left="20"
    name="push_to_talk_toggle_check"
@@ -467,6 +477,16 @@
    tool_tip="When in toggle mode, press and release the trigger key ONCE to switch your microphone on or off. When not in toggle mode, the microphone broadcasts your voice only while the trigger is being held down."
    top_pad="5"/>
   <check_box
+   control_name="VoiceAutomaticGainControl"
+   height="15"
+   tool_tip="Check to enable automatic gain control"
+   label="Automatic Gain Control"
+   layout="topleft"
+   name="voice_automatic_gain_control"
+   left="260"
+   top_pad="-15"
+   width="200"/>
+  <check_box
    name="gesture_audio_play_btn"
    control_name="EnableGestureSounds"
    disabled_control="MuteAudio"
@@ -477,6 +497,44 @@
    label="Play sounds from gestures"
    top_pad="5"
    left="20"/>
+  <text
+   layout="topleft"
+   height="15"
+   left="260"
+   top_pad="-12"
+   width="100"
+   name="noise_suppression_label">
+    Noise Suppression
+  </text>
+  <combo_box
+      control_name="VoiceNoiseSuppressionLevel"
+      layout="topleft"
+      height="23"
+      left_pad="10"
+      top_pad="-18"
+      name="noise_suppression_combo"
+      width="80">
+  <item
+      label="Off"
+      name="noise_suppression_none"
+      value="0"/>
+  <item
+      label="Low"
+      name="noise_suppression_low"
+      value="1"/>
+  <item
+      label="Moderate"
+      name="noise_suppression_moderate"
+      value="2"/>
+  <item
+      label="High"
+      name="noise_suppression_high"
+      value="3"/>
+  <item
+      label="Max"
+      name="noise_suppression_max"
+      value="4"/>
+  </combo_box>
   <button
    control_name="ShowDeviceSettings"
    follows="left|top"
@@ -485,9 +543,9 @@
    label="Voice Input/Output devices"
    layout="topleft"
    left="20"
-   top_pad="9"
+   top_pad="0"
    name="device_settings_btn"
-   width="230">
+   width="200">
   </button>
     <panel
     layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_region_debug.xml b/indra/newview/skins/default/xui/en/panel_region_debug.xml
index 04a510d4e8..be8468a15c 100644
--- a/indra/newview/skins/default/xui/en/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_debug.xml
@@ -140,7 +140,7 @@
      layout="topleft"
      left_delta="0"
      name="return_other_land"
-     tool_tip="Return only objects which are on land belonging to someone else"
+     tool_tip="Return only objects which are on land that isn't owned by selected user"
      top_delta="20"
      width="80" />
     <check_box
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 74d21c436e..6ef1b6e44a 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
@@ -270,8 +270,20 @@
      left="250"
      name="manage_telehub_btn"
      top="70"
-     width="150">
+     width="160">
 		<button.commit_callback
          function="RegionInfo.ManageTelehub" />
     </button>
+    <button
+     follows="left|top"
+     height="20"
+     label="Manage Restart Schedule..."
+     layout="topleft"
+     name="manage_restart_btn"
+     top_pad="5"
+     left_delta="0"
+     width="160">
+        <button.commit_callback
+         function="RegionInfo.ManageRestart" />
+    </button>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain_texture_transform.xml b/indra/newview/skins/default/xui/en/panel_region_terrain_texture_transform.xml
new file mode 100644
index 0000000000..9a90700056
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_region_terrain_texture_transform.xml
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel
+ border="true"
+ follows="top|left"
+ height="460"
+ label="Terrain"
+ layout="topleft"
+ left="0"
+ name="Terrain"
+ top="320"
+ width="480">
+    <text
+     follows="left|top"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="region_text_lbl"
+     top="10"
+     width="100">
+        Region:
+    </text>
+    <text
+     follows="left|top"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left_delta="50"
+     name="region_text"
+     top_delta="0"
+     width="400">
+        unknown
+    </text>
+    <text
+     type="string"
+     length="1"
+     halign="left"
+     valign="center"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     name="detail_texture_text"
+     left="10"
+     top="35"
+     width="170">
+        Terrain Textures
+    </text>
+    <text
+     type="string"
+     length="1"
+     halign="left"
+     valign="center"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     name="detail_material_text"
+     left="10"
+     top="35"
+     width="170">
+        Terrain Materials
+    </text>
+    <check_box
+     height="20"
+     halign="left"
+     valign="center"
+     follows="left|top"
+     layout="topleft"
+     top_delta="1"
+     left_delta="180"
+     label="PBR Metallic Roughness"
+     name="terrain_material_type"
+     tool_tip="If checked, use PBR Metallic Roughness materials for terrain. Otherwise, use textures."
+     left_pad="2"
+     width="200" />
+    <texture_picker
+     follows="left|top"
+     height="121"
+     layout="topleft"
+     left="10"
+     name="texture_detail_0"
+     default_image_id="0bc58228-74a0-7e83-89bc-5c23464bcec5"
+     top_delta="30"
+     width="100" />
+    <texture_picker
+     follows="top"
+     height="121"
+     layout="topleft"
+     left_pad="10"
+     name="texture_detail_1"
+     default_image_id="63338ede-0037-c4fd-855b-015d77112fc8"
+     top_delta="0"
+     width="100" />
+    <texture_picker
+     follows="left|top"
+     height="121"
+     layout="topleft"
+     left_pad="10"
+     name="texture_detail_2"
+     default_image_id="303cd381-8560-7579-23f1-f0a880799740"
+     top_delta="0"
+     width="100" />
+    <texture_picker
+     follows="left|top"
+     height="121"
+     layout="topleft"
+     left_pad="10"
+     name="texture_detail_3"
+     default_image_id="53a2f406-4895-1d13-d541-d2e3b86bc19c"
+     top_delta="0"
+     width="100" />
+    <texture_picker
+     visible="false"
+     follows="left|top"
+     height="121"
+     layout="topleft"
+     left="10"
+     name="material_detail_0"
+     pick_type="material"
+     default_image_id="968cbad0-4dad-d64e-71b5-72bf13ad051a"
+     top_delta="0"
+     width="100" />
+    <texture_picker
+     visible="false"
+     follows="left|top"
+     height="121"
+     layout="topleft"
+     left_pad="10"
+     name="material_detail_1"
+     pick_type="material"
+     default_image_id="968cbad0-4dad-d64e-71b5-72bf13ad051a"
+     top_delta="0"
+     width="100" />
+    <texture_picker
+     visible="false"
+     follows="left|top"
+     height="121"
+     layout="topleft"
+     left_pad="10"
+     name="material_detail_2"
+     pick_type="material"
+     default_image_id="968cbad0-4dad-d64e-71b5-72bf13ad051a"
+     top_delta="0"
+     width="100" />
+    <texture_picker
+     visible="false"
+     follows="left|top"
+     height="121"
+     layout="topleft"
+     left_pad="10"
+     name="material_detail_3"
+     pick_type="material"
+     default_image_id="968cbad0-4dad-d64e-71b5-72bf13ad051a"
+     top_delta="0"
+     width="100" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="height_text_lbl"
+     top_delta="104"
+     width="65">
+        1 (Low)
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left_pad="45"
+     name="height_text_lbl2"
+     top_delta="0"
+     width="100">
+        2
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left_pad="10"
+     name="height_text_lbl3"
+     top_delta="0"
+     width="100">
+        3
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left_pad="10"
+     name="height_text_lbl4"
+     top_delta="0"
+     width="100">
+        4 (High)
+    </text>
+    <layout_stack name="terrain_features_stack"
+      width="477"
+      height="230"
+      follows="all"
+      animate="false"
+      left="0"
+      top_delta="22"
+      orientation="vertical">
+      <layout_panel name="frame_settings_terrain"
+        auto_resize="true"
+        user_resize="false"
+        height="230"
+        width="467"
+        min_height="0"
+        visible="true">
+        <tab_container
+          follows="all"
+          halign="left"
+          height="230"
+          visible="true"
+          layout="topleft"
+          left="0"
+          name="terrain_tabs"
+          tab_position="top"
+          tab_width="110"
+          tab_padding_right="3"
+          top_pad="0"
+          width="700">
+          <panel
+            border="true"
+            filename="panel_settings_terrain_elevation.xml"
+            label="Elevation"
+            layout="topleft"
+            left_delta="0"
+            top_pad="5"
+            name="terrain_elevation_panel" />
+          <panel
+            border="true"
+            filename="panel_settings_terrain_transform.xml"
+            label="Transforms"
+            layout="topleft"
+            left_delta="0"
+            top_pad="5"
+            name="terrain_transform_panel" />
+        </tab_container>
+      </layout_panel>
+    </layout_stack>
+    <button
+     enabled="true"
+     follows="left|top"
+     height="20"
+     label="Apply"
+     layout="topleft"
+     left="351"
+     name="apply_btn"
+     top_delta="310"
+     width="100" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
index 2035bc2caa..ec642131ae 100644
--- a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
@@ -84,7 +84,7 @@
      enabled="false"
      height="132"
      image_disabled="PushButton_Disabled"
-     image_disabled_selected="PushButton_Disabled_Selected"
+     image_disabled_selected="PushButton_Selected_Disabled"
      image_selected="PushButton_Selected"
      image_unselected="PushButton_Off"
      layout="topleft"
@@ -97,7 +97,7 @@
      enabled="false"
      height="132"
      image_disabled="PushButton_Disabled"
-     image_disabled_selected="PushButton_Disabled_Selected"
+     image_disabled_selected="PushButton_Selected_Disabled"
      image_selected="PushButton_Selected"
      image_unselected="PushButton_Off"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
index 59ee0c6ad5..a29cdb5b41 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
@@ -9,7 +9,7 @@
         top="0">
   <string name="hdr_string">HDR Scale:</string>
   <string name="brightness_string">Brightness:</string>
-  <string name="hdr_tooltip">Intensity of lightning effects such as realistically bright skies and dynamic exposure. 1.0 is the default, 0 is off, values between 0 and 1 are mixing Ambient with HDR.</string>
+  <string name="hdr_tooltip">Intensity of lighting effects such as realistically bright skies and dynamic exposure. 1.0 is the default, 0 is off, values between 0 and 1 are mixing Ambient with HDR.</string>
     <layout_stack
             name="main_ls"
             follows="all"
@@ -318,7 +318,7 @@
                             layout="topleft"
                             left_delta="-5"
                             top_delta="25"
-                            tooltip="Irradiance control.  When not zero, enables HDR lighting model."
+                            tool_tip="Irradiance control. When not zero, enables HDR lighting model."
                             width="200">
                     Reflection Probe Ambiance (HDR):
                   </text>
diff --git a/indra/newview/skins/default/xui/en/panel_settings_terrain_elevation.xml b/indra/newview/skins/default/xui/en/panel_settings_terrain_elevation.xml
new file mode 100644
index 0000000000..89443290ce
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_settings_terrain_elevation.xml
@@ -0,0 +1,307 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel
+  border="true"
+  follows="all"
+  label="Elevation"
+  layout="topleft"
+  left="0"
+  name="panel_settings_terrain_elevation"
+  top="0">
+  <spinner
+   follows="left|top"
+   height="20"
+   label="Water Height"
+   label_width="120"
+   layout="topleft"
+   left="15"
+   max_val="100"
+   name="water_height_spin"
+   top_delta="18"
+   width="180" />
+  <spinner
+   follows="left|top"
+   height="20"
+   increment="0.2"
+   label="Terrain Raise Limit"
+   label_width="120"
+   layout="topleft"
+   left="240"
+   max_val="100"
+   name="terrain_raise_spin"
+   top_delta="0"
+   width="180" />
+  <spinner
+   follows="left|top"
+   height="20"
+   increment="0.2"
+   label="Terrain Lower Limit"
+   label_width="120"
+   layout="topleft"
+   left="240"
+   max_val="0"
+   min_val="-100"
+   name="terrain_lower_spin"
+   top_delta="20"
+   width="180" />
+  <view_border
+   bevel_style="none"
+   follows="top|left"
+   height="60"
+   layout="topleft"
+   left="8"
+   top_delta="-30"
+   width="460" />
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="20"
+   layout="topleft"
+   left="10"
+   name="height_text_lbl5"
+   top_delta="74"
+   width="300">
+      Texture Elevation Ranges
+  </text>
+  <text
+   visible="false"
+   type="string"
+   length="1"
+   follows="left|top"
+   height="20"
+   layout="topleft"
+   left="10"
+   name="height_text_lbl5_material"
+   top_delta="0"
+   width="300">
+      Material Elevation Ranges
+  </text>
+  <text
+   follows="left|top"
+   height="20"
+   layout="topleft"
+   left="10"
+   name="height_text_lbl10"
+   top_delta="30"
+   width="200"
+   word_wrap="true">
+    These values represent the blend range for the textures above.
+  </text>
+  <text
+   visible="false"
+   follows="left|top"
+   height="20"
+   layout="topleft"
+   left="10"
+   name="height_text_lbl10_material"
+   top_delta="0"
+   width="200"
+   word_wrap="true">
+    These values represent the blend range for the materials above.
+  </text>
+  <text
+     follows="left|top"
+     height="60"
+     layout="topleft"
+     left_delta="0"
+     name="height_text_lbl11"
+     top_delta="32"
+     width="200"
+     word_wrap="true">
+      Measured in meters, the LOW value is the MAXIMUM height of Texture #1, and the HIGH value is the MINIMUM height of Texture #4.
+  </text>
+  <text
+     visible="false"
+     follows="left|top"
+     height="60"
+     layout="topleft"
+     left_delta="0"
+     name="height_text_lbl11_material"
+     top_delta="0"
+     width="200"
+     word_wrap="true">
+      Measured in meters, the LOW value is the MAXIMUM height of Material #1, and the HIGH value is the MINIMUM height of Material #4.
+  </text>
+  <text
+   follows="left|top"
+   height="20"
+   layout="topleft"
+   left="270"
+   name="height_text_lbl6"
+   top_delta="-62"
+   width="100">
+      Northwest
+  </text>
+  <text
+   follows="left|top"
+   height="20"
+   layout="topleft"
+   left_pad="10"
+   name="height_text_lbl7"
+   top_delta="0"
+   width="100">
+      Northeast
+  </text>
+<!--  northwest low-->
+   <spinner
+    follows="left|top"
+    height="20"
+    increment="0.5"
+    label="Low"
+    label_width="37"
+    layout="topleft"
+    left="230"
+    max_val="500"
+    min_val="-500"
+    name="height_start_spin_1"
+    top_delta="15"
+    width="100" />
+<!--    northeast low-->
+    <spinner
+     follows="left|top"
+     height="20"
+     increment="0.5"
+     label="Low"
+     label_width="37"
+     layout="topleft"
+     left_pad="10"
+     max_val="500"
+     min_val="-500"
+     name="height_start_spin_3"
+     top_delta="0"
+     width="100" />
+<!--  northwest high-->
+   <spinner
+    follows="left|top"
+    height="20"
+    increment="0.5"
+    label="High"
+    label_width="37"
+    layout="topleft"
+    left="230"
+    max_val="500"
+    min_val="-500"
+    name="height_range_spin_1"
+    top_delta="20"
+    width="100" />
+<!--  northeast high-->
+  <spinner
+     follows="left|top"
+     height="20"
+     increment="0.5"
+     label="High"
+     label_width="37"
+     layout="topleft"
+     left_pad="10"
+     max_val="500"
+     min_val="-500"
+     name="height_range_spin_3"
+     top_delta="0"
+     width="100" />
+  <text
+   follows="left|top"
+   height="20"
+   layout="topleft"
+   left="270"
+   name="height_text_lbl8"
+   top_pad="10"
+   width="100">
+      Southwest
+  </text>
+  <text
+   follows="left|top"
+   height="20"
+   layout="topleft"
+   left_pad="10"
+   name="height_text_lbl9"
+   top_delta="0"
+   width="100">
+      Southeast
+  </text>
+<!--  southwest low-->
+  <spinner
+   follows="left|top"
+   height="20"
+   increment="0.5"
+   label="Low"
+   label_width="37"
+   layout="topleft"
+   left="230"
+   max_val="500"
+   min_val="-500"
+   name="height_start_spin_0"
+   top_delta="15"
+   width="100" />
+<!--  southeast low-->
+  <spinner
+   follows="left|top"
+   height="20"
+   increment="0.5"
+   label="Low"
+   label_width="37"
+   layout="topleft"
+   left_pad="10"
+   max_val="500"
+   min_val="-500"
+   name="height_start_spin_2"
+   top_delta="0"
+   width="100" />
+<!--southwest high-->
+  <spinner
+   follows="left|top"
+   height="20"
+   increment="0.5"
+   label="High"
+   label_width="37"
+   layout="topleft"
+   left="230"
+   max_val="500"
+   min_val="-500"
+   name="height_range_spin_0"
+   top_delta="20"
+   width="100" />
+<!--  southeast high-->
+  <spinner
+   follows="left|top"
+   height="20"
+   increment="0.5"
+   label="High"
+   label_width="37"
+   layout="topleft"
+   left_pad="10"
+   max_val="500"
+   min_val="-500"
+   name="height_range_spin_2"
+   top_delta="0"
+   width="100" />
+<!-- Terrain Download/Upload/Bake buttons -->
+  <button
+   follows="left|top"
+   height="20"
+   label="Download RAW terrain..."
+   layout="topleft"
+   left="10"
+   name="download_raw_btn"
+   tool_tip="Available only to estate owners, not managers"
+   top_delta="40"
+   width="160" />
+  <button
+   follows="left|top"
+   height="20"
+   label="Upload RAW terrain..."
+   layout="topleft"
+   left_pad="10"
+   top_delta="0"
+   name="upload_raw_btn"
+   tool_tip="Available only to estate owners, not managers"
+   width="160" />
+  <button
+   follows="left|top"
+   height="20"
+   label="Bake Terrain"
+   layout="topleft"
+   left_pad="10"
+   name="bake_terrain_btn"
+   tool_tip="Set current terrain as mid-point for raise/lower limits"
+   width="100" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_settings_terrain_transform.xml b/indra/newview/skins/default/xui/en/panel_settings_terrain_transform.xml
new file mode 100644
index 0000000000..0bf0d8cffc
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_settings_terrain_transform.xml
@@ -0,0 +1,421 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel
+  border="true"
+  follows="all"
+  label="Samping"
+  layout="topleft"
+  left="0"
+  name="panel_settings_terrain_transform"
+  top="0">
+  <text
+   type="string"
+   length="1"
+   halign="center"
+   valign="center"
+   follows="left|top"
+   height="20"
+   layout="topleft"
+   name="terrain0_label"
+   left="48"
+   top_delta="0"
+   width="62">
+      1
+  </text>
+  <text
+   type="string"
+   length="1"
+   halign="center"
+   valign="center"
+   follows="left|top"
+   height="20"
+   layout="topleft"
+   name="terrain1_label"
+   left_delta="110"
+   top_delta="0"
+   width="62">
+      2
+  </text>
+  <text
+   type="string"
+   length="1"
+   halign="center"
+   valign="center"
+   follows="left|top"
+   height="20"
+   layout="topleft"
+   name="terrain2_label"
+   left_delta="110"
+   top_delta="0"
+   width="62">
+      3
+  </text>
+  <text
+   type="string"
+   length="1"
+   halign="center"
+   valign="center"
+   follows="left|top"
+   height="20"
+   layout="topleft"
+   name="terrain3_label"
+   left_delta="110"
+   top_delta="0"
+   width="62">
+      4
+  </text>
+  <text
+   type="string"
+   length="1"
+   halign="left"
+   valign="center"
+   follows="left|top"
+   height="20"
+   layout="topleft"
+   name="terrain0ScaleU_label"
+   left="10"
+   top_pad="0"
+   width="170">
+      Scale u
+  </text>
+  <spinner
+   follows="left|top"
+   height="19"
+   initial_value="1"
+   label="Scale u"
+   label_width="0"
+   layout="topleft"
+   left="46"
+   min_val="-100"
+   max_val="100"
+   name="terrain0ScaleU"
+   width="64" />
+  <spinner
+   follows="left|top"
+   height="19"
+   initial_value="1"
+   label="Scale u"
+   label_width="0"
+   layout="topleft"
+   left_delta="110"
+   min_val="-100"
+   max_val="100"
+   name="terrain1ScaleU"
+   width="64" />
+  <spinner
+   follows="left|top"
+   height="19"
+   initial_value="1"
+   label="Scale u"
+   label_width="0"
+   layout="topleft"
+   left_delta="110"
+   min_val="-100"
+   max_val="100"
+   name="terrain2ScaleU"
+   width="64" />
+  <spinner
+   follows="left|top"
+   height="19"
+   initial_value="1"
+   label="Scale u"
+   label_width="0"
+   layout="topleft"
+   left_delta="110"
+   min_val="-100"
+   max_val="100"
+   name="terrain3ScaleU"
+   width="64" />
+  <view_border
+   bevel_style="none"
+   follows="top|left"
+   height="0"
+   layout="topleft"
+   left="8"
+   top_pad="8"
+   name="terrainScaleU_horizontal"
+   width="432" />
+  <text
+   type="string"
+   length="1"
+   halign="left"
+   valign="center"
+   follows="left|top"
+   height="20"
+   layout="topleft"
+   name="terrain0ScaleV_label"
+   left="10"
+   top_pad="0"
+   width="170">
+      Scale v
+  </text>
+  <spinner
+   follows="left|top"
+   height="19"
+   initial_value="1"
+   label="Scale v"
+   label_width="0"
+   layout="topleft"
+   left="46"
+   min_val="-100"
+   max_val="100"
+   name="terrain0ScaleV"
+   width="64" />
+  <spinner
+   follows="left|top"
+   height="19"
+   initial_value="1"
+   label="Scale u"
+   label_width="0"
+   layout="topleft"
+   left_delta="110"
+   min_val="-100"
+   max_val="100"
+   name="terrain1ScaleV"
+   width="64" />
+  <spinner
+   follows="left|top"
+   height="19"
+   initial_value="1"
+   label="Scale u"
+   label_width="0"
+   layout="topleft"
+   left_delta="110"
+   min_val="-100"
+   max_val="100"
+   name="terrain2ScaleV"
+   width="64" />
+  <spinner
+   follows="left|top"
+   height="19"
+   initial_value="1"
+   label="Scale u"
+   label_width="0"
+   layout="topleft"
+   left_delta="110"
+   min_val="-100"
+   max_val="100"
+   name="terrain3ScaleV"
+   width="64" />
+  <view_border
+   bevel_style="none"
+   follows="top|left"
+   height="0"
+   layout="topleft"
+   left="8"
+   top_pad="8"
+   name="terrainScaleV_horizontal"
+   width="432" />
+  <text
+   type="string"
+   length="1"
+   halign="left"
+   valign="center"
+   follows="left|top"
+   height="20"
+   layout="topleft"
+   name="terrain0Rotation_label"
+   left="10"
+   top_pad="0"
+   width="170">
+      Rotation
+  </text>
+  <spinner
+   follows="left|top"
+   height="19"
+   initial_value="0"
+   label="Rotation"
+   label_width="0"
+   layout="topleft"
+   left="46"
+   min_val="-360"
+   max_val="360"
+   name="terrain0Rotation"
+   width="64" />
+  <spinner
+   follows="left|top"
+   height="19"
+   initial_value="0"
+   label="Scale u"
+   label_width="0"
+   layout="topleft"
+   left_delta="110"
+   min_val="-360"
+   max_val="360"
+   name="terrain1Rotation"
+   width="64" />
+  <spinner
+   follows="left|top"
+   height="19"
+   initial_value="0"
+   label="Scale u"
+   label_width="0"
+   layout="topleft"
+   left_delta="110"
+   min_val="-360"
+   max_val="360"
+   name="terrain2Rotation"
+   width="64" />
+  <spinner
+   follows="left|top"
+   height="19"
+   initial_value="0"
+   label="Scale u"
+   label_width="0"
+   layout="topleft"
+   left_delta="110"
+   min_val="-360"
+   max_val="360"
+   name="terrain3Rotation"
+   width="64" />
+  <view_border
+   bevel_style="none"
+   follows="top|left"
+   height="0"
+   layout="topleft"
+   left="8"
+   top_pad="8"
+   name="terrainRotation_horizontal"
+   width="432" />
+  <text
+   type="string"
+   length="1"
+   halign="left"
+   valign="center"
+   follows="left|top"
+   height="20"
+   layout="topleft"
+   name="terrain0OffsetU_label"
+   left="10"
+   top_pad="0"
+   width="170">
+      Offset y
+  </text>
+  <spinner
+   follows="left|top"
+   height="19"
+   initial_value="0"
+   label="Offset u"
+   label_width="0"
+   layout="topleft"
+   left="46"
+   min_val="-999"
+   max_val="999"
+   name="terrain0OffsetU"
+   width="64" />
+  <spinner
+   follows="left|top"
+   height="19"
+   initial_value="0"
+   label="Scale u"
+   label_width="0"
+   layout="topleft"
+   left_delta="110"
+   min_val="-999"
+   max_val="999"
+   name="terrain1OffsetU"
+   width="64" />
+  <spinner
+   follows="left|top"
+   height="19"
+   initial_value="0"
+   label="Scale u"
+   label_width="0"
+   layout="topleft"
+   left_delta="110"
+   min_val="-999"
+   max_val="999"
+   name="terrain2OffsetU"
+   width="64" />
+  <spinner
+   follows="left|top"
+   height="19"
+   initial_value="0"
+   label="Scale u"
+   label_width="0"
+   layout="topleft"
+   left_delta="110"
+   min_val="-999"
+   max_val="999"
+   name="terrain3OffsetU"
+   width="64" />
+  <view_border
+   bevel_style="none"
+   follows="top|left"
+   height="0"
+   layout="topleft"
+   left="8"
+   top_pad="8"
+   name="terrainOffsetU_horizontal"
+   width="432" />
+  <text
+   type="string"
+   length="1"
+   halign="left"
+   valign="center"
+   follows="left|top"
+   height="20"
+   layout="topleft"
+   name="terrain0OffsetV_label"
+   left="10"
+   top_pad="0"
+   width="170">
+      Offset v
+  </text>
+  <spinner
+   follows="left|top"
+   height="19"
+   initial_value="0"
+   label="Offset v"
+   label_width="0"
+   layout="topleft"
+   left="46"
+   min_val="-999"
+   max_val="999"
+   name="terrain0OffsetV"
+   width="64" />
+  <spinner
+   follows="left|top"
+   height="19"
+   initial_value="0"
+   label="Scale u"
+   label_width="0"
+   layout="topleft"
+   left_delta="110"
+   min_val="-999"
+   max_val="999"
+   name="terrain1OffsetV"
+   width="64" />
+  <spinner
+   follows="left|top"
+   height="19"
+   initial_value="0"
+   label="Scale u"
+   label_width="0"
+   layout="topleft"
+   left_delta="110"
+   min_val="-999"
+   max_val="999"
+   name="terrain2OffsetV"
+   width="64" />
+  <spinner
+   follows="left|top"
+   height="19"
+   initial_value="0"
+   label="Scale u"
+   label_width="0"
+   layout="topleft"
+   left_delta="110"
+   min_val="-999"
+   max_val="999"
+   name="terrain3OffsetV"
+   width="64" />
+  <view_border
+   bevel_style="none"
+   follows="top|left"
+   height="0"
+   layout="topleft"
+   left="8"
+   top_pad="8"
+   name="terrainOffsetV_horizontal"
+   width="432" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index bee58da6b0..2d04b3e0fe 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3818,6 +3818,7 @@ Please reinstall viewer from  https://secondlife.com/support/downloads/ and cont
 
   <string name="voice_morphing_url">https://secondlife.com/destination/voice-island</string>
   <string name="premium_voice_morphing_url">https://secondlife.com/destination/voice-morphing-premium</string>
+  <string name="no_voice_morphing_faq_url">https://lindenlab.freshdesk.com/support/solutions/articles/31000173560-webrtc-update-for-voice-chat-faq/</string>
 
   <string name="lindenhomes_get_home_url">https://secondlife.com/land/lindenhomes/member.php</string>
   <string name="lindenhomes_my_home_url">https://land.secondlife.com/en-Us/lindenhomes/my-home.php</string>
diff --git a/indra/newview/skins/default/xui/en/widgets/drop_down.xml b/indra/newview/skins/default/xui/en/widgets/drop_down.xml
index 75ed485645..80f98b64fc 100644
--- a/indra/newview/skins/default/xui/en/widgets/drop_down.xml
+++ b/indra/newview/skins/default/xui/en/widgets/drop_down.xml
@@ -12,7 +12,7 @@
                           image_unselected="PushButton_Off"
                           image_selected="PushButton_Selected"
                           image_disabled="PushButton_Disabled"
-                          image_disabled_selected="PushButton_Disabled_Selected"
+                          image_disabled_selected="PushButton_Selected_Disabled"
                           image_overlay="Combobox_Over"
                           image_overlay_alignment="right" />
   <drop_down.combo_list bg_writeable_color="white" />
diff --git a/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml b/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
index 6cc8d7118f..4a1ba169ad 100644
--- a/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
+++ b/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <emoji_complete
   autosize="false"
-  hover_image="ListItem_Over"
   selected_image="ListItem_Select"
   max_visible="7"
   padding="8"
author	Nat Goodspeed <nat@lindenlab.com>	2024-08-13 15:32:47 -0400
committer	Nat Goodspeed <nat@lindenlab.com>	2024-08-13 15:32:47 -0400
commit	23f2631d598b6e07450a96ed1ec00670c8867cdd (patch)
tree	20195c1688ad8cb7e8631c97fa5920624f10972c /indra/newview/skins/default/xui/en
parent	54334ff6e377e35c97df3a0fe2a859795ec07b21 (diff)
parent	8ce3323269d95f54e2b768c4c5aa154d4afbbb6b (diff)