From b6841d75c2f259c84d5ab6b012bd2ae37d985451 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 15 Apr 2022 19:02:07 -0500
Subject: SL-17219 WIP - Texture pipeline overhaul

---
 .../xui/en/floater_preferences_graphics_advanced.xml    | 17 -----------------
 1 file changed, 17 deletions(-)

(limited to 'indra/newview/skins/default')

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 d1e167df64..0a4acd979a 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
@@ -272,23 +272,6 @@
      Hardware
   </text>
 
-  <slider
-    control_name="TextureMemory"
-    decimal_digits="0"
-    follows="left|top"
-    height="16"
-    increment="16"
-    initial_value="32"
-    label="Texture Memory (MB):"
-    label_width="185"
-    layout="topleft"
-    left="30"
-    max_val="4096"
-    name="GraphicsCardTextureMemory"
-    tool_tip="Amount of memory to allocate for textures. Defaults to video card memory. Reducing this may improve performance but may also make textures blurry."
-    top_delta="16"
-    width="335" />
-
   <slider
     control_name="RenderFogRatio"
     follows="left|top"
-- 
cgit v1.2.3


From c4625d26e51dcfa0480fa936b894d3625b68eda2 Mon Sep 17 00:00:00 2001
From: Dave Houlton <euclid@lindenlab.com>
Date: Wed, 27 Apr 2022 11:42:02 -0600
Subject: Prototype a SaveMaterial button

---
 indra/newview/skins/default/xui/en/panel_tools_texture.xml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 90f32ae452..9aaac7ac85 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -793,4 +793,16 @@
              height="4"
              start_url="about:blank"
              decouple_texture_size="true" />
-	   </panel>
+      <button
+       left="90"
+       top="222"
+       height="20"
+       label="Save as Material"
+       label_selected="Save current face as a Material"
+       layout="topleft"
+       name="button save material"
+       top_delta="0"
+       tool_tip="Save material to inventory"
+       width="110" />
+
+</panel>
-- 
cgit v1.2.3


From 3f43553ea096ce27da11ff797708ef7d6a391389 Mon Sep 17 00:00:00 2001
From: Brad Kittenbrink <brad@lindenlab.com>
Date: Wed, 27 Apr 2022 14:55:06 -0700
Subject: Test UI for SL-17116.  provide a debug interface to set a MaterialID
 for a face

---
 indra/newview/skins/default/xui/en/floater_tools.xml    |  4 ++--
 .../skins/default/xui/en/panel_tools_texture.xml        | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 0abee2ff80..44bdcd86f9 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2,7 +2,7 @@
 <floater
  positioning="cascading"
  legacy_header_height="18"
- height="600"
+ height="640"
  layout="topleft"
  bg_opaque_image="Window_NoTitle_Foreground"
  bg_alpha_image="Window_NoTitle_Background"
@@ -820,7 +820,7 @@
     width="282"/>
     <tab_container
      follows="left|top"
-     height="410"
+     height="460"
      halign="center"
      left="0"
      name="Object Info Tabs"
diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 90f32ae452..7b43dd7628 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -2,7 +2,7 @@
 <panel
          border="false"
          follows="all"
-         height="420"
+         height="500"
          label="Texture"
          layout="topleft"
          left="0"
@@ -772,7 +772,7 @@
              width="260" />
 			<button
 			 left="10"
-			 top="222"
+			 top="257"
 			 height="20"
 			 label="Align"
 			 label_selected="Align current texture layers"
@@ -793,4 +793,17 @@
              height="4"
              start_url="about:blank"
              decouple_texture_size="true" />
+            <line_editor
+             enabled="true"
+             follows="top|left"
+             height="16"
+             layout="topleft"
+             left="7"
+             label="Material UUID"
+             name="materialID"
+             select_on_focus="true"
+             top="380"
+             width="200"
+             tool_tip="UUID for a material asset"
+             />
 	   </panel>
-- 
cgit v1.2.3


From deffbca3ee209f6aea3358692d9ca6dc7090e748 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 28 Apr 2022 15:51:31 +0000
Subject: SL-17281 environment map prototype (stupid slow and hacky, but
 provides a way to get a "real" environment map for shader development)

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 8d7cfe1116..db4e794ed4 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3250,6 +3250,13 @@ function="World.EnvPreset"
                  function="ToggleControl"
                  parameter="RenderHoverGlowEnable" />
             </menu_item_check>
+            <menu_item_call
+              enabled="true"
+              label="Override Environment Map"
+              name="Override Environment Map">
+              <menu_item_call.on_click
+               function="Develop.OverrideEnvironmentMap" />
+            </menu_item_call>
           <menu_item_separator />
           
           <menu_item_call
-- 
cgit v1.2.3


From c9be81a74753600b8a06f369966674b50ef9781a Mon Sep 17 00:00:00 2001
From: "Brad Kittenbrink (Brad Linden)" <brad@lindenlab.com>
Date: Thu, 28 Apr 2022 17:30:51 -0700
Subject: SL-17198 material asset uploading now suuceeeds.

---
 indra/newview/skins/default/xui/en/notifications.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 4f1755a99b..a85131cc75 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11831,4 +11831,10 @@ Unpacking: [UNPACK_TIME]s [USIZE]KB
     </form>
   </notification>
 
+<notification
+ icon="notifytip.tga"
+ name="MaterialCreated"
+ type="notifytip">
+Material successfully created.  Asset ID: [ASSET_ID]
+</notification>
 </notifications>
-- 
cgit v1.2.3


From 3400e5fd302c0d9dea6386c4d5bf38876f2cc287 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Mon, 16 May 2022 17:21:08 +0000
Subject: SL-17284 Reflection probe tuning and optimization take 1

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index db4e794ed4..0b0f8e17bc 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2911,6 +2911,16 @@ function="World.EnvPreset"
            function="Advanced.ToggleInfoDisplay"
            parameter="lights" />
         </menu_item_check>
+        <menu_item_check
+         label="Reflection Probes"
+         name="Reflection Probes">
+          <menu_item_check.on_check
+           function="Advanced.CheckInfoDisplay"
+           parameter="reflection probes" />
+          <menu_item_check.on_click
+           function="Advanced.ToggleInfoDisplay"
+           parameter="reflection probes" />
+        </menu_item_check>
         <menu_item_check
          label="Particles"
          name="Particles">
@@ -3252,10 +3262,10 @@ function="World.EnvPreset"
             </menu_item_check>
             <menu_item_call
               enabled="true"
-              label="Override Environment Map"
-              name="Override Environment Map">
+              label="Rebuild Reflection Probes"
+              name="Rebuild Reflection Probes">
               <menu_item_call.on_click
-               function="Develop.OverrideEnvironmentMap" />
+               function="Develop.RebuildReflectionProbes" />
             </menu_item_call>
           <menu_item_separator />
           
-- 
cgit v1.2.3


From 0940e8871894e08da80730d11c31cbd252a05b35 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 24 May 2022 10:34:47 -0500
Subject: SL-17472 Add checkbox to preferences for enabling "PBR" that uses
 "class3" deferred shaders.  Move reflection probe shaders to class3 and
 restore class2 shaders to non-reflection probe versions.

---
 .../default/xui/en/panel_preferences_graphics1.xml     | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default')

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 5aff7a5127..90bb45d1bc 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -258,7 +258,21 @@
     <check_box.commit_callback
       function="Pref.RenderOptionUpdate" />
   </check_box>
-  
+
+  <check_box
+    control_name="RenderPBR"
+    height="16"
+    initial_value="true"
+    label="Physically Based Rendering"
+    layout="topleft"
+    left="30"
+    name="UsePBRShaders"
+    top_delta="24"
+    width="256">
+    <check_box.commit_callback
+      function="Pref.RenderOptionUpdate" />
+  </check_box>
+
   <slider
     control_name="IndirectMaxComplexity"
     tool_tip="Controls at what point a visually complex avatar is drawn as a JellyDoll"
@@ -274,7 +288,7 @@
     max_val="101"
     name="IndirectMaxComplexity"
     show_text="false"
-    top_delta="60"
+    top_delta="36"
     width="300">
     <slider.commit_callback
       function="Pref.UpdateIndirectMaxComplexity"
-- 
cgit v1.2.3


From dfa71e2bb59e81de93f626fada6975ae46b01bb6 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 31 May 2022 11:57:15 -0500
Subject: SL-17490 Only update a subset of textures each frame and remove dead
 debug code.

---
 .../xui/en/floater_texture_fetch_debugger.xml      | 440 ---------------------
 indra/newview/skins/default/xui/en/menu_viewer.xml |  14 -
 2 files changed, 454 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
deleted file mode 100644
index 9278a1a598..0000000000
--- a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
+++ /dev/null
@@ -1,440 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_minimize="false"
- height="600"
- layout="topleft"
- name="TexFetchDebugger"
- help_topic="texfetchdebugger"
- title="Texture Fetching Debugger"
- width="540">
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left="10"
-   name="total_num_fetched_label"
-   top="30"
-   width="400">
-    1, Total number of fetched textures: [NUM]
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_num_fetching_requests_label"
-   top_delta="25"
-   width="400">
-    2, Total number of fetching requests: [NUM]
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_num_cache_hits_label"
-   top_delta="25"
-   width="400">
-    3, Total number of cache hits: [NUM]
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_num_visible_tex_label"
-   top_delta="25"
-   width="400">
-    4, Total number of visible textures: [NUM]
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_num_visible_tex_fetch_req_label"
-   top_delta="25"
-   width="450">
-    5, Total number of visible texture fetching requests: [NUM]
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_fetched_data_label"
-   top_delta="25"
-   width="530">
-    6, Total number of fetched data: [SIZE1]KB, Decoded Data: [SIZE2]KB, [PIXEL]MPixels
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_fetched_vis_data_label"
-   top_delta="25"
-   width="480">
-    7, Total number of visible data: [SIZE1]KB, Decoded Data: [SIZE2]KB
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_fetched_rendered_data_label"
-   top_delta="25"
-   width="530">
-    8, Total number of rendered data: [SIZE1]KB, Decoded Data: [SIZE2]KB, [PIXEL]MPixels
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_time_cache_read_label"
-   top_delta="25"
-   width="400">
-    9, Total time on cache readings: [TIME] seconds
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_time_cache_write_label"
-   top_delta="25"
-   width="400">
-    10, Total time on cache writings: [TIME] seconds
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_time_decode_label"
-   top_delta="25"
-   width="400">
-    11, Total time on decodings: [TIME] seconds
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_time_gl_label"
-   top_delta="25"
-   width="400">
-    12, Total time on gl texture creation: [TIME] seconds
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_time_http_label"
-   top_delta="25"
-   width="400">
-    13, Total time on HTTP fetching: [TIME] seconds
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_time_fetch_label"
-   top_delta="25"
-   width="400">
-    14, Total time on entire fetching: [TIME] seconds
-  </text>
-  <text
-  type="string"
-  length="1"
-  follows="left|top"
-  height="25"
-  layout="topleft"
-  left_delta="0"
-  name="total_time_refetch_vis_cache_label"
-  top_delta="25"
-  width="540">
-    15, Refetching visibles from cache, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels
-  </text>
-  <text
-  type="string"
-  length="1"
-  follows="left|top"
-  height="25"
-  layout="topleft"
-  left_delta="0"
-  name="total_time_refetch_all_cache_label"
-  top_delta="25"
-  width="540">
-    16, Refetching all textures from cache, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels
-  </text>
-  <text
-  type="string"
-  length="1"
-  follows="left|top"
-  height="25"
-  layout="topleft"
-  left_delta="0"
-  name="total_time_refetch_vis_http_label"
-  top_delta="25"
-  width="540">
-    17, Refetching visibles from HTTP, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels
-  </text>
-  <text
-  type="string"
-  length="1"
-  follows="left|top"
-  height="25"
-  layout="topleft"
-  left_delta="0"
-  name="total_time_refetch_all_http_label"
-  top_delta="25"
-  width="540">
-    18, Refetching all textures from HTTP, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels
-  </text>
-  <spinner
-     decimal_digits="2"
-     follows="left|top"
-     height="20"
-     increment="0.01"
-     initial_value="1.0"
-     label="19, Ratio of Texel/Pixel:"
-     label_width="130"
-     layout="topleft"
-     left_delta="0"
-     max_val="10.0"
-     min_val="0.01"
-     name="texel_pixel_ratio"
-     top_delta="30"
-     width="200">
-    <spinner.commit_callback
-		function="TexFetchDebugger.ChangeTexelPixelRatio" />
-  </spinner>
-  <text
-  type="string"
-  length="1"
-  follows="left|top"
-  height="25"
-  layout="topleft"
-  left_delta="0"
-  name="texture_source_label"
-  top_delta="30"
-  width="110">
-    20, Texture Source:
-  </text>
-  <radio_group
-     control_name="TextureFetchSource"
-     follows="top|left"
-     draw_border="false"
-     height="25"
-     layout="topleft"
-     left_pad="0"
-     name="texture_source"
-     top_delta="0"
-     width="264">
-    <radio_item
-     height="16"
-     label="Cache + HTTP"
-     layout="topleft"
-     left="3"
-     name="0"
-     top="0"
-     width="100" />
-    <radio_item
-     height="16"
-     label="HTTP Only"
-     layout="topleft"
-     left_delta="100"
-     name="1"
-     top_delta="0"
-     width="200" />
-  </radio_group>
-  <button
-   follows="left|top"
-   height="20"
-   label="Start"
-   layout="topleft"
-   left="10"
-   name="start_btn"
-   top_delta="20"
-   width="70">
-    <button.commit_callback
-		function="TexFetchDebugger.Start" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="Reset"
-   layout="topleft"
-   left_pad="7"
-   name="clear_btn"
-   top_delta="0"
-   width="70">
-    <button.commit_callback
-		function="TexFetchDebugger.Clear" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="Close"
-   layout="topleft"
-   left_pad="7"
-   name="close_btn"
-   top_delta="0"
-   width="70">
-    <button.commit_callback
-		function="TexFetchDebugger.Close" />
-  </button>
-  <button
-   follows="left|top"
-   height="22"
-   label="Reset Fetching Time"
-   layout="topleft"
-   left_pad="175"
-   name="reset_time_btn"
-   top_delta="0"
-   width="120">
-    <button.commit_callback
-		function="TexFetchDebugger.ResetFetchTime" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="Cache Read"
-   layout="topleft"
-   left="10"
-   name="cacheread_btn"
-   top_delta="20"
-   width="80">
-    <button.commit_callback
-		function="TexFetchDebugger.CacheRead" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="Cache Write"
-   layout="topleft"
-   left_pad="7"
-   name="cachewrite_btn"
-   top_delta="0"
-   width="80">
-    <button.commit_callback
-		function="TexFetchDebugger.CacheWrite" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="HTTP"
-   layout="topleft"
-   left_pad="7"
-   name="http_btn"
-   top_delta="0"
-   width="70">
-    <button.commit_callback
-		function="TexFetchDebugger.HTTPLoad" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="Decode"
-   layout="topleft"
-   left_pad="7"
-   name="decode_btn"
-   top_delta="0"
-   width="70">
-    <button.commit_callback
-		function="TexFetchDebugger.Decode" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="GL Texture"
-   layout="topleft"
-   left_pad="7"
-   name="gl_btn"
-   top_delta="0"
-   width="70">
-    <button.commit_callback
-		function="TexFetchDebugger.GLTexture" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="Refetch Vis Cache"
-   layout="topleft"
-   left="10"
-   name="refetchviscache_btn"
-   top_delta="20"
-   width="120">
-    <button.commit_callback
-		function="TexFetchDebugger.RefetchVisCache" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="Refetch All Cache"
-   layout="topleft"
-   left_pad="7"
-   name="refetchallcache_btn"
-   top_delta="0"
-   width="120">
-    <button.commit_callback
-		function="TexFetchDebugger.RefetchAllCache" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="Refetch Vis HTTP"
-   layout="topleft"
-   left_pad="7"
-   name="refetchvishttp_btn"
-   top_delta="0"
-   width="120">
-    <button.commit_callback
-		function="TexFetchDebugger.RefetchVisHTTP" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="Refetch All HTTP"
-   layout="topleft"
-   left_pad="7"
-   name="refetchallhttp_btn"
-   top_delta="0"
-   width="120">
-    <button.commit_callback
-		function="TexFetchDebugger.RefetchAllHTTP" />
-  </button>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 8d7cfe1116..85c20268d0 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2438,20 +2438,6 @@ function="World.EnvPreset"
                function="Advanced.ToggleConsole"
                parameter="scene monitor" />
             </menu_item_check>
-            <menu_item_call
-              enabled="false"
-              visible="false"
-              label="Texture Fetch Debug Console"
-              name="Texture Fetch Debug Console">
-              <menu_item_call.on_click
-                function="Floater.Show"
-                parameter="tex_fetch_debugger" />
-              <on_enable
-                function="Develop.SetTexFetchDebugger" />
-              <on_visible
-                function="Develop.SetTexFetchDebugger" />
-            </menu_item_call>
-          
             <menu_item_separator/>
 
             <menu_item_call
-- 
cgit v1.2.3


From 220afbcda0961df86ad08bbd51d96b8c868b2e62 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 2 Jun 2022 18:42:38 -0500
Subject: SL-17285 Add proper reflection probe support to LLVOVolume,
 LLPrimitive, and LLPanelVolume

---
 .../newview/skins/default/xui/en/floater_tools.xml | 58 +++++++++++++++++++++-
 1 file changed, 56 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 44bdcd86f9..ae4eb64264 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2353,7 +2353,7 @@ even though the user gets a free copy.
              layout="topleft"
              left="10"
              name="Light Intensity"
-             top_pad="3"
+             top_delta="32"
              width="128" />
           <spinner bottom_delta="0"
                    decimal_digits="3"
@@ -2420,7 +2420,61 @@ even though the user gets a free copy.
                    mouse_opaque="true"
                    name="Light Ambiance"
                    width="120" />
-            <text
+          <check_box
+             height="16"
+             label="Reflection Probe"
+             layout="topleft"
+             left="10"
+             name="Reflection Probe Checkbox Ctrl"
+             tool_tip="Adjusts how objects within this volume receive reflections when PBR is enabled"
+             top_pad="15"
+             width="60" />
+          <combo_box
+			   height="19"
+			   top_delta="0"
+         left="144"
+			   follows="left|top"
+			   name="Probe Volume Type Ctrl"
+			   tool_tip="Choose the probe influence volume"
+			   width="108">
+            <combo_box.item
+             label="Sphere"
+             name="Sphere"
+             value="Sphere" />
+            <combo_box.item
+             label="Box"
+             name="Box"
+             value="Box"/>
+          </combo_box>
+          <spinner bottom_delta="19"
+                   decimal_digits="3"
+                   follows="left|top"
+                   height="16"
+                   increment="0.05"
+                   initial_value="0"
+                   label="Ambiance"
+                   label_width="55"
+                   left="10"
+                   max_val="1"
+                   min_val="0"
+                   mouse_opaque="true"
+                   name="Probe Ambiance"
+                   width="120" />
+          <spinner bottom_delta="0"
+                   decimal_digits="3"
+                   follows="left|top"
+                   height="16"
+                   increment="0.05"
+                   initial_value="0"
+                   label="Near Clip"
+                   label_width="55"
+                   left="144"
+                   max_val="1024"
+                   min_val="0"
+                   mouse_opaque="true"
+                   name="Probe Near Clip"
+                   width="120" />
+          <text
              type="string"
              length="1"
              follows="left|top"
-- 
cgit v1.2.3


From 0d9c23372bf8b34387b7d9de89234d3e9a5fd879 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 9 Jun 2022 14:09:33 -0500
Subject: SL-17551 Add "Select Reflection Probes" menu option and make
 invisible objects less annoying when alt-zooming in edit mode.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 0b0f8e17bc..159b9aebd0 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1417,6 +1417,15 @@ function="World.EnvPreset"
                      function="Tools.SelectOnlyMovableObjects"
                      parameter="movable" />
                 </menu_item_check>
+            <menu_item_check
+                 label="Select Reflection Probes"
+                 name="Select Reflection Probes">
+                    <menu_item_check.on_check
+                     control="SelectReflectionProbes" />
+                    <menu_item_check.on_click
+                     function="Tools.SelectReflectionProbes"
+                     parameter="probes" />
+            </menu_item_check>
                 <menu_item_check
                  label="Select By Surrounding"
                  name="Select By Surrounding">
-- 
cgit v1.2.3


From 03d85bfb33f53e658256d8bedcf0b4262226cf90 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 9 Jun 2022 19:43:21 -0500
Subject: SL-17573 Add "dynamic" checkbox, also followup on SL-17551 and do
 "Select Invisible Objects" checkbox instead of "Select Reflection Probes"

---
 indra/newview/skins/default/xui/en/floater_tools.xml | 17 +++++++++++++----
 indra/newview/skins/default/xui/en/menu_viewer.xml   | 10 +++++-----
 2 files changed, 18 insertions(+), 9 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index ae4eb64264..449bf8fa3a 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2317,7 +2317,7 @@ even though the user gets a free copy.
              left="10"
              name="Light Checkbox Ctrl"
              tool_tip="Causes object to emit light"
-             top_pad="15"
+             top_pad="10"
              width="60" />
             <color_swatch
              can_apply_immediately="true"
@@ -2425,16 +2425,16 @@ even though the user gets a free copy.
              label="Reflection Probe"
              layout="topleft"
              left="10"
-             name="Reflection Probe Checkbox Ctrl"
+             name="Reflection Probe"
              tool_tip="Adjusts how objects within this volume receive reflections when PBR is enabled"
-             top_pad="15"
+             top_pad="10"
              width="60" />
           <combo_box
 			   height="19"
 			   top_delta="0"
          left="144"
 			   follows="left|top"
-			   name="Probe Volume Type Ctrl"
+			   name="Probe Volume Type"
 			   tool_tip="Choose the probe influence volume"
 			   width="108">
             <combo_box.item
@@ -2446,6 +2446,15 @@ even though the user gets a free copy.
              name="Box"
              value="Box"/>
           </combo_box>
+          <check_box
+             height="16"
+             label="Dynamic"
+             layout="topleft"
+             left="10"
+             name="Probe Dynamic"
+             tool_tip="When enabled, Avatars will appear in reflections within this probe's influence volume."
+             bottom_delta="19"
+             width="60" />
           <spinner bottom_delta="19"
                    decimal_digits="3"
                    follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 159b9aebd0..7a5c2099eb 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1418,13 +1418,13 @@ function="World.EnvPreset"
                      parameter="movable" />
                 </menu_item_check>
             <menu_item_check
-                 label="Select Reflection Probes"
-                 name="Select Reflection Probes">
+                 label="Select Invisible Objects"
+                 name="Select Invisible Objects">
                     <menu_item_check.on_check
-                     control="SelectReflectionProbes" />
+                     control="SelectInvisibleObjects" />
                     <menu_item_check.on_click
-                     function="Tools.SelectReflectionProbes"
-                     parameter="probes" />
+                     function="Tools.SelectInvisibleObjects"
+                     parameter="invisible" />
             </menu_item_check>
                 <menu_item_check
                  label="Select By Surrounding"
-- 
cgit v1.2.3


From 509476f95ed75ce8289ecd69b4c94d9912e1d3df Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 10 Jun 2022 01:13:41 -0500
Subject: SL-17574 Add probe detail combo box to advanced graphics preferences.
  Fix spot light shadows not working in probes.

---
 .../en/floater_preferences_graphics_advanced.xml   | 38 ++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default')

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 d1e167df64..8e12a01c6f 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
@@ -863,8 +863,42 @@
        name="2"
        value="2"/>
   </combo_box>
-  
-<!-- End of Advanced Settings block -->
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    left="480"
+    name="RenderReflectionDetailText"
+    text_readonly_color="LabelDisabledColor"
+    top_delta="16"
+    width="128">
+    Reflections:
+  </text>
+  <combo_box
+   control_name="RenderReflectionProbeDetail"
+   height="18"
+   layout="topleft"
+   left_delta="130"
+   top_delta="0"
+   name="ReflectionDetial"
+   width="150">
+    <combo_box.item
+      label="Static Only"
+      name="0"
+      value="0"/>
+    <combo_box.item
+      label="Static+Dynamic"
+      name="1"
+      value="1"/>
+    <combo_box.item
+      label="Realtime"
+      name="2"
+      value="2"/>
+  </combo_box>
+
+  <!-- End of Advanced Settings block -->
 	<view_border
       bevel_style="in"
       height="0"
-- 
cgit v1.2.3


From 929abcd296199ab4ed7a0b08166e284502f7b8df Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 10 Jun 2022 16:36:38 -0500
Subject: SL-17523 Add reflection probe ambiance to windlight settings and
 integrate with UI and ReflectionMapManager

---
 .../default/xui/en/panel_settings_sky_atmos.xml    | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'indra/newview/skins/default')

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 6f82a0efa1..094be36b01 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
@@ -315,6 +315,29 @@
                             top_delta="20"
                             width="219"
                             can_edit_text="true"/>
+                  <text
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left_delta="-5"
+                            top_delta="25"
+                            width="200">
+                    Reflection Probe Ambiance:
+                  </text>
+                  <slider
+                          decimal_digits="3"
+                          follows="left|top"
+                          height="16"
+                          increment="0.01"
+                          initial_value="0"
+                          layout="topleft"
+                          left_delta="5"
+                          min_val="0"
+                          max_val="1"
+                          name="probe_ambiance"
+                          top_delta="20"
+                          width="219"
+                          can_edit_text="true"/>
                 </layout_panel>            
             </layout_stack>                
         </layout_panel>
-- 
cgit v1.2.3


From ad533fcd6b1a3433273fa6d75e19a7ce56c75867 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 14 Jun 2022 23:39:11 -0500
Subject: SL-17586 WIP -- LLMaterialEditor prototype and "New Material"
 inventory buttons.

---
 .../default/xui/en/floater_material_editor.xml     | 374 +++++++++++++++++++++
 .../skins/default/xui/en/menu_inventory.xml        |   8 +
 .../skins/default/xui/en/menu_inventory_add.xml    |   8 +
 indra/newview/skins/default/xui/en/menu_viewer.xml |  10 +-
 indra/newview/skins/default/xui/en/strings.xml     |   1 +
 5 files changed, 400 insertions(+), 1 deletion(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_material_editor.xml

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml
new file mode 100644
index 0000000000..5d72e6f79d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -0,0 +1,374 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="false"
+ default_tab_group="1"
+ height="777"
+ layout="topleft"
+ name="material editor"
+ help_topic="material_editor"
+ title="Material: [MATERIAL_NAME]"
+ width="256">
+  <panel
+    border="true"
+         follows="left|top"
+         width="246"
+         height="196"
+         layout="topleft"
+         left="5"
+         mouse_opaque="false"
+         name="Texture"
+         top="20"
+         >
+  <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left="10"
+             top="5"
+             width="64">
+    Albedo:
+  </text>
+  <texture_picker
+             can_apply_immediately="true"
+             default_image_name="Default"
+             fallback_image="materials_ui_x_24.png"
+             follows="left|top"
+             top_pad="8"
+             height="151"
+             layout="topleft"
+             left="10"
+             name="albedo texture"
+             tool_tip="Albedo map.  Alpha channel is optional and used for transparency."
+             width="128" />
+  <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_pad="5"
+             top_delta="-15"
+             >
+    Tint
+  </text>
+  <color_swatch
+                    can_apply_immediately="true"
+                    follows="left|top"
+                    height="40"
+                    label_height="0"
+                    layout="topleft"
+                    left_delta="0"
+                    top_pad="5"
+                    name="albedo color"
+                    width="40" />
+    <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_delta="0"
+             top_pad="5"
+             width="96"
+             >
+      Transparency
+    </text>
+    <spinner
+               decimal_digits="3"
+               follows="left|top"
+               height="19"
+               increment="0.01"
+               initial_value="1"
+               layout="topleft"
+               left_delta="0"
+               top_pad="5"
+               max_val="1"
+               name="transparency"
+              width="64"
+             />
+    <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_delta="0"
+             name="label alphamode"
+             text_readonly_color="LabelDisabledColor"
+             top_pad="5"
+             width="90">
+      Alpha mode
+    </text>
+    <combo_box
+     height="23"
+     layout="topleft"
+     left_delta="0"
+     name="alpha mode"
+     top_pad="4"
+     width="96">
+      <combo_box.item
+       label="None"
+       name="None"
+       value="OPAQUE" />
+      <combo_box.item
+       label="Alpha blending"
+       name="Alpha blending"
+       value="BLEND" />
+      <combo_box.item
+       label="Alpha masking"
+       name="Alpha masking"
+       value="MASK" />
+    </combo_box>
+    <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_delta="0"
+             top_pad="5"
+             width="96"
+             >
+      Alpha Cutoff
+    </text>
+    <spinner
+               decimal_digits="3"
+               follows="left|top"
+               height="19"
+               increment="0.01"
+               initial_value="1"
+               layout="topleft"
+               left_delta="0"
+               top_pad="5"
+               max_val="1"
+               name="alpha cutoff"
+              width="64"
+             />
+  </panel>
+  <panel
+    border="true"
+         follows="left|top"
+         width="246"
+         height="160"
+         layout="topleft"
+         left="5"
+         mouse_opaque="false"
+         name="Texture"
+         top_pad="5"
+         >
+    <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left="10"
+             top_pad="5"
+             >
+    Metallic-Roughness:
+  </text>
+  <texture_picker
+             can_apply_immediately="true"
+             default_image_name="Default"
+             fallback_image="materials_ui_x_24.png"
+             follows="left|top"
+             width="128" 
+             height="151"
+             layout="topleft"
+             left="10"
+             name="metallic-roughness texture"
+             tool_tip="GLTF metallic-roughness map with optional occlusion.  Red channel is occlusion, green channel is roughness, blue channel is metalness."
+             top_pad="8"
+             />
+  <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_pad="5"
+             top_delta="-15"
+             >
+    Metallic Factor
+  </text>
+  <spinner
+             decimal_digits="3"
+             follows="left|top"
+             height="19"
+             increment="0.01"
+             initial_value="0"
+             layout="topleft"
+             left_delta="0"
+             top_pad="5"
+             max_val="100"
+             name="metalness factor"
+            width="64"
+             />
+    <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_delta="0"
+             top_pad="5"
+             width="96"
+             >
+      Roughness Factor
+    </text>
+    <spinner
+               decimal_digits="3"
+               follows="left|top"
+               height="19"
+               increment="0.01"
+               initial_value="0"
+               layout="topleft"
+               left_delta="0"
+               top_pad="5"
+               max_val="100"
+               name="roughness factor"
+              width="64"
+             />
+  </panel>
+  <panel
+    border="true"
+         follows="left|top"
+         width="246"
+         height="160"
+         layout="topleft"
+         left="5"
+         mouse_opaque="false"
+         name="Texture"
+         top_pad="5"
+         >
+    <text
+               type="string"
+               length="1"
+               follows="left|top"
+               height="10"
+               layout="topleft"
+               left="10"
+               top="5"
+               width="64">
+      Emissive:
+    </text>
+    <texture_picker
+               can_apply_immediately="true"
+               default_image_name="Default"
+               fallback_image="materials_ui_x_24.png"
+               follows="left|top"
+               top_pad="8"
+               height="151"
+               layout="topleft"
+               left="10"
+               name="emissive texture"
+               width="128" />
+    <text
+               type="string"
+               length="1"
+               follows="left|top"
+               height="10"
+               layout="topleft"
+               left_pad="5"
+               top_delta="-15"
+             >
+      Tint
+    </text>
+    <color_swatch
+                      can_apply_immediately="true"
+                      follows="left|top"
+                      height="40"
+                      label_height="0"
+                      layout="topleft"
+                      left_delta="0"
+                      top_pad="5"
+                      name="emissive color"
+                      width="40" />
+    <!--<text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             width="64"
+             layout="topleft"
+             left_delta="0"
+             top_pad="5"
+             >
+      Intensity
+    </text>
+    <spinner
+               decimal_digits="3"
+               follows="left|top"
+               height="19"
+               increment="0.01"
+               initial_value="0"
+               layout="topleft"
+               left_delta="0"
+               top_pad="5"
+               max_val="100"
+              width="64"
+             />-->
+  </panel>
+  <panel
+    border="true"
+         follows="left|top"
+         width="246"
+         height="160"
+         layout="topleft"
+         left="5"
+         mouse_opaque="false"
+         top_pad="5"
+         >
+    <text
+               type="string"
+               length="1"
+               follows="left|top"
+               height="10"
+               layout="topleft"
+               left="10"
+               top="5"
+               width="64">
+      Normal:
+    </text>
+    <texture_picker
+               can_apply_immediately="true"
+               default_image_name="Default"
+               fallback_image="materials_ui_x_24.png"
+               follows="left|top"
+               top_pad="8"
+               height="151"
+               layout="topleft"
+               left="10"
+               name="normal texture"
+               width="128" />
+    <!--<check_box
+          follows="left|top"
+          label="Mikkt Space"
+          left_pad="10"
+          top_delta="0"
+          height="25"
+          width="120" />-->
+  </panel>
+  <check_box
+          follows="left|top"
+          label="Double Sided"
+          left="5"
+          top_pad="5"
+          name="double sided"
+          height="25"
+          width="120" />
+  <button
+             follows="right|bottom"
+             height="25"
+             label="Save"
+             layout="bottomright"
+             name="save"
+             tool_tip="Browse for an editor (executable) to edit floater XML files"
+             top_delta="-2"
+             left="5"
+             width="246" />
+  
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 78ca170813..60a177f0bd 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -183,6 +183,14 @@
          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>
     <menu
      label="New Clothes"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index 3385a29a6c..0e193521a3 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -97,6 +97,14 @@
                  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>
             <menu
              height="175"
              label="New Clothes"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 7a5c2099eb..623d0d88eb 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1595,7 +1595,15 @@ function="World.EnvPreset"
                  parameter="" />
             </menu_item_call>
         </menu>
-        <menu_item_separator/>
+        <menu_item_call
+            label="Material Editor"
+            name="material_editor_menu_item">
+          <menu_item_call.on_click
+              function="Floater.ToggleOrBringToFront"
+              parameter="material_editor" />
+        </menu_item_call>
+
+      <menu_item_separator/>
         <menu_item_call
          enabled="false"
          label="Undo"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index acb3a720b9..0866f29355 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3835,6 +3835,7 @@ Abuse Report</string>
   <string name="New Physics">New Physics</string>
   <string name="Invalid Wearable">Invalid Wearable</string>
   <string name="New Gesture">New Gesture</string>
+  <string name="New Material">New Material</string>
   <string name="New Script">New Script</string>
   <string name="New Note">New Note</string>
   <string name="New Folder">New Folder</string>
-- 
cgit v1.2.3


From f5d66e79eec07384ef6f4fd3f516f7a9d010fb9e Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 15 Jun 2022 17:03:38 -0500
Subject: SL-17605 WIP - Upload->Material now lets you pick a GLTF file and
 imports the first material in the GLTF file to the Material Editor

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 623d0d88eb..4b3c61d7f0 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1583,6 +1583,16 @@ function="World.EnvPreset"
             <menu_item_call.on_visible
             function="File.VisibleUploadModel"/>
             </menu_item_call>
+          <menu_item_call
+           label="Material..."
+           layout="topleft"
+           name="Upload Material">
+            <menu_item_call.on_click
+             function="File.UploadMaterial"
+             parameter="" />
+            <menu_item_call.on_enable
+             function="File.EnableUploadMaterial" />
+          </menu_item_call>
 	   <menu_item_call
              label="Bulk..."
              layout="topleft"
-- 
cgit v1.2.3


From 0bc7fee11fe43281d5d3c97e95249f9c26af0eb1 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 23 Jun 2022 19:51:11 +0300
Subject: SL-17640 Materials Upload UI #1

1. Allow 'none' textures
2. Disable 'apply now' buttons
3. Switch from loading dae files to just gltf glb
---
 .../default/xui/en/floater_material_editor.xml     | 40 ++++++++++++----------
 .../newview/skins/default/xui/en/notifications.xml |  8 +++++
 2 files changed, 30 insertions(+), 18 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml
index 5d72e6f79d..8482795f6f 100644
--- a/indra/newview/skins/default/xui/en/floater_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -7,8 +7,16 @@
  layout="topleft"
  name="material editor"
  help_topic="material_editor"
- title="Material: [MATERIAL_NAME]"
+ title="[MATERIAL_NAME]"
  width="256">
+  <check_box
+          follows="left|top"
+          label="Double Sided"
+          left="14"
+          top="14"
+          name="double sided"
+          height="25"
+          width="120" />
   <panel
     border="true"
          follows="left|top"
@@ -18,7 +26,7 @@
          left="5"
          mouse_opaque="false"
          name="Texture"
-         top="20"
+         top_pad="5"
          >
   <text
              type="string"
@@ -31,10 +39,11 @@
              width="64">
     Albedo:
   </text>
-  <texture_picker
-             can_apply_immediately="true"
+    <texture_picker
+             can_apply_immediately="false"
              default_image_name="Default"
              fallback_image="materials_ui_x_24.png"
+             allow_no_texture="true"
              follows="left|top"
              top_pad="8"
              height="151"
@@ -55,7 +64,7 @@
     Tint
   </text>
   <color_swatch
-                    can_apply_immediately="true"
+                    can_apply_immediately="false"
                     follows="left|top"
                     height="40"
                     label_height="0"
@@ -170,10 +179,11 @@
              >
     Metallic-Roughness:
   </text>
-  <texture_picker
-             can_apply_immediately="true"
+    <texture_picker
+             can_apply_immediately="false"
              default_image_name="Default"
              fallback_image="materials_ui_x_24.png"
+             allow_no_texture="true"
              follows="left|top"
              width="128" 
              height="151"
@@ -256,9 +266,10 @@
       Emissive:
     </text>
     <texture_picker
-               can_apply_immediately="true"
+               can_apply_immediately="false"
                default_image_name="Default"
                fallback_image="materials_ui_x_24.png"
+               allow_no_texture="true"
                follows="left|top"
                top_pad="8"
                height="151"
@@ -278,7 +289,7 @@
       Tint
     </text>
     <color_swatch
-                      can_apply_immediately="true"
+                      can_apply_immediately="false"
                       follows="left|top"
                       height="40"
                       label_height="0"
@@ -334,9 +345,10 @@
       Normal:
     </text>
     <texture_picker
-               can_apply_immediately="true"
+               can_apply_immediately="false"
                default_image_name="Default"
                fallback_image="materials_ui_x_24.png"
+               allow_no_texture="true"
                follows="left|top"
                top_pad="8"
                height="151"
@@ -352,14 +364,6 @@
           height="25"
           width="120" />-->
   </panel>
-  <check_box
-          follows="left|top"
-          label="Double Sided"
-          left="5"
-          top_pad="5"
-          name="double sided"
-          height="25"
-          width="120" />
   <button
              follows="right|bottom"
              height="25"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 786cf32e7a..8670aa92f4 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9025,6 +9025,14 @@ Unable to upload texture.
 [REASON]   
   <tag>fail</tag>  
   </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotUploadMaterial"
+   type="alertmodal">
+There was a problem uploading the file
+    <tag>fail</tag>
+  </notification>
   
   <notification
    icon="alertmodal.tga"
-- 
cgit v1.2.3


From da1d9139b3412e391b5ed7c868d350760719ee9e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 24 Jun 2022 01:02:01 +0300
Subject: SL-17640 Materials Upload UI #2

New Fee fields
New Buttons
---
 .../default/xui/en/floater_material_editor.xml     | 178 +++++++++++++++++----
 .../newview/skins/default/xui/en/notifications.xml |  34 +++-
 2 files changed, 181 insertions(+), 31 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml
index 8482795f6f..815a53a887 100644
--- a/indra/newview/skins/default/xui/en/floater_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -3,12 +3,14 @@
  legacy_header_height="18"
  can_resize="false"
  default_tab_group="1"
- height="777"
+ height="887"
  layout="topleft"
  name="material editor"
  help_topic="material_editor"
  title="[MATERIAL_NAME]"
  width="256">
+  <string name="no_upload_fee_string">no upload fee</string>
+  <string name="upload_fee_string">L$10 upload fee</string>
   <check_box
           follows="left|top"
           label="Double Sided"
@@ -30,6 +32,7 @@
          >
   <text
              type="string"
+             font.style="BOLD"
              length="1"
              follows="left|top"
              height="10"
@@ -49,9 +52,23 @@
              height="151"
              layout="topleft"
              left="10"
-             name="albedo texture"
+             name="albedo_texture"
              tool_tip="Albedo map.  Alpha channel is optional and used for transparency."
              width="128" />
+    <text
+               type="string"
+               font.style="BOLD"
+               length="1"
+               follows="left|top"
+               height="10"
+               width="128"
+               layout="topleft"
+               left="10"
+               top_pad="-17"
+               name="albedo_upload_fee"
+             >
+      No upload fee
+    </text>
   <text
              type="string"
              length="1"
@@ -59,7 +76,7 @@
              height="10"
              layout="topleft"
              left_pad="5"
-             top_delta="-15"
+             top="8"
              >
     Tint
   </text>
@@ -161,7 +178,7 @@
     border="true"
          follows="left|top"
          width="246"
-         height="160"
+         height="175"
          layout="topleft"
          left="5"
          mouse_opaque="false"
@@ -170,12 +187,13 @@
          >
     <text
              type="string"
+             font.style="BOLD"
              length="1"
              follows="left|top"
              height="10"
              layout="topleft"
              left="10"
-             top_pad="5"
+             top="5"
              >
     Metallic-Roughness:
   </text>
@@ -189,10 +207,24 @@
              height="151"
              layout="topleft"
              left="10"
-             name="metallic-roughness texture"
+             name="metallic_roughness_texture"
              tool_tip="GLTF metallic-roughness map with optional occlusion.  Red channel is occlusion, green channel is roughness, blue channel is metalness."
              top_pad="8"
              />
+  <text
+             type="string"
+             font.style="BOLD"
+             length="1"
+             follows="left|top"
+             height="10"
+             width="128"
+             layout="topleft"
+             left="10"
+             top_pad="-17"
+             name="metallic_upload_fee"
+           >
+    No upload fee
+  </text>
   <text
              type="string"
              length="1"
@@ -200,7 +232,7 @@
              height="10"
              layout="topleft"
              left_pad="5"
-             top_delta="-15"
+             top="8"
              >
     Metallic Factor
   </text>
@@ -247,7 +279,7 @@
     border="true"
          follows="left|top"
          width="246"
-         height="160"
+         height="175"
          layout="topleft"
          left="5"
          mouse_opaque="false"
@@ -256,6 +288,7 @@
          >
     <text
                type="string"
+               font.style="BOLD"
                length="1"
                follows="left|top"
                height="10"
@@ -275,8 +308,22 @@
                height="151"
                layout="topleft"
                left="10"
-               name="emissive texture"
+               name="emissive_texture"
                width="128" />
+    <text
+               type="string"
+               font.style="BOLD"
+               length="1"
+               follows="left|top"
+               height="10"
+               width="128"
+               layout="topleft"
+               left="10"
+               top_pad="-17"
+               name="emissive_upload_fee"
+           >
+      No upload fee
+    </text>
     <text
                type="string"
                length="1"
@@ -284,7 +331,7 @@
                height="10"
                layout="topleft"
                left_pad="5"
-               top_delta="-15"
+               top="8"
              >
       Tint
     </text>
@@ -327,7 +374,7 @@
     border="true"
          follows="left|top"
          width="246"
-         height="160"
+         height="175"
          layout="topleft"
          left="5"
          mouse_opaque="false"
@@ -335,6 +382,7 @@
          >
     <text
                type="string"
+               font.style="BOLD"
                length="1"
                follows="left|top"
                height="10"
@@ -354,25 +402,95 @@
                height="151"
                layout="topleft"
                left="10"
-               name="normal texture"
+               name="normal_texture"
                width="128" />
-    <!--<check_box
-          follows="left|top"
-          label="Mikkt Space"
-          left_pad="10"
-          top_delta="0"
-          height="25"
-          width="120" />-->
+    <text
+               type="string"
+               font.style="BOLD"
+               length="1"
+               follows="left|top"
+               height="10"
+               width="128"
+               layout="topleft"
+               left="10"
+               top_pad="-17"
+               name="normal_upload_fee"
+           >
+      No upload fee
+    </text>
+  </panel>
+
+  <panel
+         follows="right|bottom"
+         width="246"
+         height="82"
+         layout="bottomright"
+         top_delta="-2"
+         left="0"
+         name="button_panel"
+         >
+    <text
+               type="string"
+               font.style="BOLD"
+               length="1"
+               follows="left|top"
+               height="10"
+               width="200"
+               layout="topleft"
+               left="10"
+               top="0"
+           >
+      Usaved changes
+    </text>
+    <button
+               follows="left|top"
+               height="25"
+               label="Save"
+               layout="topleft"
+               name="save"
+               top_pad="7"
+               left="5"
+               width="120" />
+    <button
+               follows="left|top"
+               height="25"
+               label="Save As..."
+               layout="topleft"
+               name="save_as"
+               top_delta="0"
+               left_pad="6"
+               width="120" />
+    <text
+               type="string"
+               font.style="BOLD"
+               length="1"
+               follows="left|top"
+               height="10"
+               width="240"
+               layout="topleft"
+               left="10"
+               top_pad="5"
+           >
+      Total upload fee: L$ [FEE]
+    </text>
+    
+    <view_border
+        bevel_style="none"
+        height="0"
+        layout="topleft"
+        left="5"
+        name="button_border"
+        top_pad="7"
+        width="246"/>
+    
+    <button
+               follows="left|top"
+               height="25"
+               label="Cancel"
+               layout="topleft"
+               name="cancel"
+               top_pad="7"
+               left="61"
+               width="121" />
   </panel>
-  <button
-             follows="right|bottom"
-             height="25"
-             label="Save"
-             layout="bottomright"
-             name="save"
-             tool_tip="Browse for an editor (executable) to edit floater XML files"
-             top_delta="-2"
-             left="5"
-             width="246" />
-  
 </floater>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 8670aa92f4..23a9632ada 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9033,7 +9033,39 @@ Unable to upload texture.
 There was a problem uploading the file
     <tag>fail</tag>
   </notification>
-  
+
+  <notification
+ icon="alertmodal.tga"
+ label="Save Material"
+ name="SaveMaterialAs"
+ type="alertmodal">
+    <unique/>
+    Name this material:
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message" type="text">
+        [DESC]
+      </input>
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="OK"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InvalidMaterialName"
+   type="alertmodal">
+Please enter a non-empty name
+    <tag>fail</tag>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="LivePreviewUnavailable"
-- 
cgit v1.2.3


From 1559ad47924711f64ecd540bc605d9aa1f7221e6 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 24 Jun 2022 13:09:24 +0300
Subject: SL-17649 Icon for Material type in Inventory

---
 .../newview/skins/default/textures/icons/Inv_Material.png | Bin 0 -> 684 bytes
 indra/newview/skins/default/textures/textures.xml         |   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 indra/newview/skins/default/textures/icons/Inv_Material.png

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/textures/icons/Inv_Material.png b/indra/newview/skins/default/textures/icons/Inv_Material.png
new file mode 100644
index 0000000000..f5918ceaed
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Inv_Material.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index a36b859b6c..b0ae5fe447 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -303,6 +303,7 @@ with the same filename but different name
   <texture name="Inv_LostClosed" file_name="icons/Inv_LostClosed.png" preload="false" />
   <texture name="Inv_LostOpen" file_name="icons/Inv_LostOpen.png" preload="false" />
   <texture name="Inv_Landmark" file_name="icons/Inv_Landmark.png" preload="false" />
+  <texture name="Inv_Material" file_name="icons/Inv_Material.png" preload="false" />
   <texture name="Inv_Mesh" file_name="icons/Inv_Mesh.png" preload="false" />  
   <texture name="Inv_Notecard" file_name="icons/Inv_Notecard.png" preload="false" />
   <texture name="Inv_Object" file_name="icons/Inv_Object.png" preload="false" />
-- 
cgit v1.2.3


From 33116b8adac6eec07c5badc08d7d66ca1283686a Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 24 Jun 2022 14:09:25 +0300
Subject: SL-17650 Add Material as a filter option to Inventory filter floater

---
 .../xui/en/floater_inventory_view_finder.xml       | 43 +++++++++++++++-------
 indra/newview/skins/default/xui/en/strings.xml     |  1 +
 2 files changed, 31 insertions(+), 13 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
index d783d1e23c..e91efb89b2 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  can_minimize="false"
- height="466"
+ height="486"
  layout="topleft"
  name="Inventory Finder"
  help_topic="inventory_finder"
@@ -93,6 +93,23 @@
      name="check_landmark"
      top_delta="0"
      width="126" />
+    <icon
+     height="16"
+     image_name="Inv_Material"
+     layout="topleft"
+     left="8"
+     mouse_opaque="true"
+     name="icon_material"
+     top="122"
+     width="16" />
+    <check_box
+     height="16"
+     label="Materials"
+     layout="topleft"
+     left_pad="2"
+     name="check_material"
+     top_delta="0"
+     width="126" />
     <icon
      height="16"
      image_name="Inv_Notecard"
@@ -100,7 +117,7 @@
      left="8"
      mouse_opaque="true"
      name="icon_notecard"
-     top="122"
+     top="142"
      width="16" />
     <check_box
      height="16"
@@ -117,7 +134,7 @@
      left="8"
      mouse_opaque="true"
      name="icon_object"
-     top="142"
+     top="162"
      width="16" />
     <check_box
      height="16"
@@ -134,7 +151,7 @@
      left="8"
      mouse_opaque="true"
      name="icon_script"
-     top="162"
+     top="182"
      width="16" />
     <check_box
      height="16"
@@ -151,7 +168,7 @@
      left="8"
      mouse_opaque="true"
      name="icon_sound"
-     top="182"
+     top="202"
      width="16" />
     <check_box
      height="16"
@@ -168,7 +185,7 @@
      left="8"
      mouse_opaque="true"
      name="icon_texture"
-     top="202"
+     top="222"
      width="16" />
     <check_box
      height="16"
@@ -185,7 +202,7 @@
      left="8"
      mouse_opaque="true"
      name="icon_snapshot"
-     top="222"
+     top="242"
      width="16" />
     <check_box
      height="16"
@@ -202,7 +219,7 @@
      left="8"
      mouse_opaque="true"
      name="icon_settings"
-     top="242"
+     top="262"
      width="16" />
     <check_box
      height="16"
@@ -220,7 +237,7 @@
      layout="topleft"
      left="8"
      name="All"
-     top="262"
+     top="282"
      width="100" />
     <button
      height="20"
@@ -274,7 +291,7 @@
      width="260"/>
     <check_box
      height="16"
-     top="352"
+     top="372"
      label="Since Logoff"
      layout="topleft"
      left_delta="0"
@@ -290,7 +307,7 @@
      layout="topleft"
      left_delta="0"
      name="- OR -"
-     top="370"
+     top="390"
      width="144">
         - OR -
     </text>
@@ -298,7 +315,7 @@
      height="16"
      layout="topleft"
      name="date_search_direction"
-     top="388"
+     top="408"
      left="8"
      width="270">
      <radio_item
@@ -368,6 +385,6 @@
      layout="topleft"
      name="Close"
      right="-6"
-     top="434"
+     top="454"
      width="76" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 0866f29355..e1678f418f 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2414,6 +2414,7 @@ If you continue to receive this message, please contact Second Life support for
 	<string name="Clothing"      value=" Clothing," />
 	<string name="Gestures"      value=" Gestures," />
 	<string name="Landmarks"     value=" Landmarks," />
+	<string name="Materials"     value=" Materials," />
 	<string name="Notecards"     value=" Notecards," />
 	<string name="Objects"       value=" Objects," />
 	<string name="Scripts"       value=" Scripts," />
-- 
cgit v1.2.3


From 63daefb39afba64110a48572ac629c83fb31a7c7 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 25 Jun 2022 16:50:23 +0300
Subject: SL-17640 Materials Upload UI #3

Fixed issues in button layout
Added 'unsaved changes' notification
---
 .../skins/default/xui/en/floater_material_editor.xml  | 19 +++++++++++--------
 indra/newview/skins/default/xui/en/notifications.xml  | 17 +++++++++++++++++
 2 files changed, 28 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml
index 815a53a887..36315d3b04 100644
--- a/indra/newview/skins/default/xui/en/floater_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -27,7 +27,7 @@
          layout="topleft"
          left="5"
          mouse_opaque="false"
-         name="Texture"
+         name="albedo_texture_pnl"
          top_pad="5"
          >
   <text
@@ -182,7 +182,7 @@
          layout="topleft"
          left="5"
          mouse_opaque="false"
-         name="Texture"
+         name="metallic_texture_pnl"
          top_pad="5"
          >
     <text
@@ -283,7 +283,7 @@
          layout="topleft"
          left="5"
          mouse_opaque="false"
-         name="Texture"
+         name="emissive_texture_pnl"
          top_pad="5"
          >
     <text
@@ -379,6 +379,7 @@
          left="5"
          mouse_opaque="false"
          top_pad="5"
+         name="normal_texture_pnl"
          >
     <text
                type="string"
@@ -423,15 +424,17 @@
   <panel
          follows="right|bottom"
          width="246"
-         height="82"
+         height="97"
          layout="bottomright"
          top_delta="-2"
-         left="0"
+         left="5"
          name="button_panel"
          >
     <text
                type="string"
+               name="unsaved_changes"
                font.style="BOLD"
+               text_color="DrYellow"
                length="1"
                follows="left|top"
                height="10"
@@ -449,7 +452,7 @@
                layout="topleft"
                name="save"
                top_pad="7"
-               left="5"
+               left="0"
                width="120" />
     <button
                follows="left|top"
@@ -466,7 +469,7 @@
                length="1"
                follows="left|top"
                height="10"
-               width="240"
+               width="220"
                layout="topleft"
                left="10"
                top_pad="5"
@@ -478,7 +481,7 @@
         bevel_style="none"
         height="0"
         layout="topleft"
-        left="5"
+        left="0"
         name="button_border"
         top_pad="7"
         width="246"/>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 23a9632ada..0ca3e043e7 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9066,6 +9066,23 @@ Please enter a non-empty name
     <tag>fail</tag>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="UsavedMaterialChanges"
+   type="alertmodal">
+    You have unsaved changes.
+    <form name="form">
+      <button
+       index="0"
+       name="discard"
+       text="Discard changes"/>
+      <button
+       index="1"
+       name="keep"
+       text="Keep editing"/>
+    </form>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="LivePreviewUnavailable"
-- 
cgit v1.2.3


From 00a04b87a9fae83fd42419a5b3ace632095405ef Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 27 Jun 2022 22:30:14 +0300
Subject: SL-17640 Fix name usage, fix "apply now"

This reverts commit 231c618a844cee26a3779b703c88d8807df872e6, instead color swatched get enabled 'apply now' in xml.
---
 .../newview/skins/default/xui/en/floater_material_editor.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml
index 36315d3b04..df06896fa5 100644
--- a/indra/newview/skins/default/xui/en/floater_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -43,7 +43,7 @@
     Albedo:
   </text>
     <texture_picker
-             can_apply_immediately="false"
+             can_apply_immediately="true"
              default_image_name="Default"
              fallback_image="materials_ui_x_24.png"
              allow_no_texture="true"
@@ -81,7 +81,7 @@
     Tint
   </text>
   <color_swatch
-                    can_apply_immediately="false"
+                    can_apply_immediately="true"
                     follows="left|top"
                     height="40"
                     label_height="0"
@@ -198,7 +198,7 @@
     Metallic-Roughness:
   </text>
     <texture_picker
-             can_apply_immediately="false"
+             can_apply_immediately="true"
              default_image_name="Default"
              fallback_image="materials_ui_x_24.png"
              allow_no_texture="true"
@@ -299,7 +299,7 @@
       Emissive:
     </text>
     <texture_picker
-               can_apply_immediately="false"
+               can_apply_immediately="true"
                default_image_name="Default"
                fallback_image="materials_ui_x_24.png"
                allow_no_texture="true"
@@ -336,7 +336,7 @@
       Tint
     </text>
     <color_swatch
-                      can_apply_immediately="false"
+                      can_apply_immediately="true"
                       follows="left|top"
                       height="40"
                       label_height="0"
@@ -394,7 +394,7 @@
       Normal:
     </text>
     <texture_picker
-               can_apply_immediately="false"
+               can_apply_immediately="true"
                default_image_name="Default"
                fallback_image="materials_ui_x_24.png"
                allow_no_texture="true"
-- 
cgit v1.2.3


From 590a63afa9868198271bc1cf5660040708d1cf10 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 27 Jun 2022 23:34:14 +0300
Subject: SL-17623 Revise right-click menu on inventory folders

---
 .../skins/default/xui/en/menu_inventory.xml        | 535 +++++++++++----------
 1 file changed, 269 insertions(+), 266 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 60a177f0bd..67bcbe020b 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -143,272 +143,6 @@
          function="Inventory.EmptyLostAndFound"
          parameter="rename" />
     </menu_item_call>
-    <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 Outfit"
-     layout="topleft"
-     name="New Outfit">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="outfit" />
-    </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>
-    <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
-     label="Use as default for"
-     layout="topleft"
-     name="upload_def">
-      <menu_item_call
-       label="Image uploads"
-       layout="topleft"
-       name="Image uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="texture" />
-      </menu_item_call>
-      <menu_item_call
-       label="Sound uploads"
-       layout="topleft"
-       name="Sound uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="sound" />
-      </menu_item_call>
-      <menu_item_call
-       label="Animation uploads"
-       layout="topleft"
-       name="Animation uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="animation" />
-      </menu_item_call>
-      <menu_item_call
-       label="Model uploads"
-       layout="topleft"
-       name="Model uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="model" />
-      </menu_item_call>
-    </menu>
     <menu
      label="Change Type"
      layout="topleft"
@@ -690,6 +424,275 @@
          function="Inventory.DoToSelected"
          parameter="delete_system_folder" />
     </menu_item_call>
+    <menu_item_separator
+     layout="topleft"
+     name="Create Separator" />
+    <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 Outfit"
+     layout="topleft"
+     name="New Outfit">
+      <menu_item_call.on_click
+       function="Inventory.DoCreate"
+       parameter="outfit" />
+    </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>
+    <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
+     label="Use as default for"
+     layout="topleft"
+     name="upload_def">
+      <menu_item_call
+       label="Image uploads"
+       layout="topleft"
+       name="Image uploads">
+        <menu_item_call.on_click
+         function="Inventory.FileUploadLocation"
+         parameter="texture" />
+      </menu_item_call>
+      <menu_item_call
+       label="Sound uploads"
+       layout="topleft"
+       name="Sound uploads">
+        <menu_item_call.on_click
+         function="Inventory.FileUploadLocation"
+         parameter="sound" />
+      </menu_item_call>
+      <menu_item_call
+       label="Animation uploads"
+       layout="topleft"
+       name="Animation uploads">
+        <menu_item_call.on_click
+         function="Inventory.FileUploadLocation"
+         parameter="animation" />
+      </menu_item_call>
+      <menu_item_call
+       label="Model uploads"
+       layout="topleft"
+       name="Model uploads">
+        <menu_item_call.on_click
+         function="Inventory.FileUploadLocation"
+         parameter="model" />
+      </menu_item_call>
+    </menu>
     <menu_item_separator
      layout="topleft" />
     <menu_item_separator
-- 
cgit v1.2.3


From 57805cac68bbc67ecb8a8e76c0ced2ce9b622dd1 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 28 Jun 2022 15:15:57 -0500
Subject: SL-17379 More complete integration of material asset type

---
 .../newview/skins/default/xui/en/notifications.xml | 25 ++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 0ca3e043e7..ae4b0538d8 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6762,6 +6762,22 @@ You don&apos;t have permission to view this notecard.
   <tag>fail</tag>
   </notification>
 
+  <notification
+   icon="notifytip.tga"
+   name="MaterialMissing"
+   type="notifytip">
+    Material is missing from database.
+    <tag>fail</tag>
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="MaterialNoPermissions"
+   type="notifytip">
+    You don&apos;t have permission to view this material.
+    <tag>fail</tag>
+  </notification>
+
   <notification
    icon="notifytip.tga"
    name="RezItemNoPermissions"
@@ -6793,6 +6809,15 @@ Please try again.
   <tag>fail</tag>
   </notification>
 
+  <notification
+   icon="notifytip.tga"
+   name="UnableToLoadMaterial"
+   type="notifytip">
+    Unable to load material.
+    Please try again.
+    <tag>fail</tag>
+  </notification>
+
   <notification
    icon="notifytip.tga"
    name="ScriptMissing"
-- 
cgit v1.2.3


From 68dfa1f5501f58d1ca158aeabcc3fd07e8a2e70f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 30 Jun 2022 21:03:21 +0300
Subject: SL-17640  Use LLAgentBenefitsMgr for upload cost

---
 indra/newview/skins/default/xui/en/floater_material_editor.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml
index df06896fa5..7d532ecd7b 100644
--- a/indra/newview/skins/default/xui/en/floater_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -10,7 +10,7 @@
  title="[MATERIAL_NAME]"
  width="256">
   <string name="no_upload_fee_string">no upload fee</string>
-  <string name="upload_fee_string">L$10 upload fee</string>
+  <string name="upload_fee_string">L$[FEE] upload fee</string>
   <check_box
           follows="left|top"
           label="Double Sided"
@@ -473,6 +473,7 @@
                layout="topleft"
                left="10"
                top_pad="5"
+               name="total_upload_fee"
            >
       Total upload fee: L$ [FEE]
     </text>
-- 
cgit v1.2.3


From 81979e4b491b252d2e3af2e077d3f335aee02f7e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 11 Jul 2022 21:46:34 +0300
Subject: SL-17640 Fixed missing asset string

---
 indra/newview/skins/default/xui/en/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index e89e03dafa..4169929be8 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -405,6 +405,7 @@ http://secondlife.com/support for help fixing this problem.
 	<string name="symbolic link">link</string>
 	<string name="symbolic folder link">folder link</string>
 	<string name="settings blob">settings</string>
+	<string name="render material">material</string>
 	<string name="mesh">mesh</string>
 
 	<!-- llvoavatar. Displayed in the avatar chat bubble -->
-- 
cgit v1.2.3


From cf4b14f69108ef3079338c49cc7156056eedfce3 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 2 Aug 2022 12:34:06 -0500
Subject: SL-17706 Remove ability to disable deferred rendering and default PBR
 to on for mid and higher.

---
 .../en/floater_preferences_graphics_advanced.xml   | 14 -----------
 .../default/xui/en/panel_preferences_graphics1.xml | 28 ----------------------
 2 files changed, 42 deletions(-)

(limited to 'indra/newview/skins/default')

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 8e12a01c6f..1d508b2e36 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
@@ -601,20 +601,6 @@
       function="Pref.RenderOptionUpdate" />
   </check_box>
 
-  <check_box
-    control_name="RenderObjectBump"
-    height="16"
-    initial_value="true"
-    label="Bump mapping and shiny"
-    layout="topleft"
-    left="420"
-    name="BumpShiny"
-    top_delta="16"
-    width="300">
-    <check_box.commit_callback
-      function="Pref.RenderOptionUpdate" />
-  </check_box>
-
   <check_box
     control_name="RenderLocalLights"
     height="16"
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 90bb45d1bc..908ddd32b5 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -231,34 +231,6 @@
      m
   </text>
 
-  <check_box
-    control_name="WindLightUseAtmosShaders"
-    height="16"
-    initial_value="true"
-    label="Atmospheric shaders"
-    layout="topleft"
-    left="30"
-    name="WindLightUseAtmosShaders"
-    top_delta="24"
-    width="280">
-    <check_box.commit_callback
-      function="Pref.RenderOptionUpdate" />
-  </check_box>
-
-  <check_box
-    control_name="RenderDeferred"
-    height="16"
-    initial_value="true"
-    label="Advanced Lighting Model"
-    layout="topleft"
-    left="30"
-    name="UseLightShaders"
-    top_delta="24"
-    width="256">
-    <check_box.commit_callback
-      function="Pref.RenderOptionUpdate" />
-  </check_box>
-
   <check_box
     control_name="RenderPBR"
     height="16"
-- 
cgit v1.2.3


From 9a8e9ff3971f0571bb7c29122c547a76c3e7febe Mon Sep 17 00:00:00 2001
From: Callum Linden <callum@lindenlab.com>
Date: Tue, 2 Aug 2022 15:24:48 -0700
Subject: Fix for: SL-17888 ORM (Occlusion, Roughness, Metal) all should be
 clamped between 0.0 and 1.0

---
 indra/newview/skins/default/xui/en/floater_material_editor.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml
index 7d532ecd7b..74adc86126 100644
--- a/indra/newview/skins/default/xui/en/floater_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -245,7 +245,7 @@
              layout="topleft"
              left_delta="0"
              top_pad="5"
-             max_val="100"
+             max_val="1"
              name="metalness factor"
             width="64"
              />
@@ -270,7 +270,8 @@
                layout="topleft"
                left_delta="0"
                top_pad="5"
-               max_val="100"
+               
+               max_val="1"
                name="roughness factor"
               width="64"
              />
-- 
cgit v1.2.3


From 53bd8819f712af4f7cf161974aa2b7a45e3a8a4c Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 3 Aug 2022 10:08:52 -0500
Subject: SL-17706 Deprecate avatar cloth and remove dead UI from graphics
 preferences.

---
 .../en/floater_preferences_graphics_advanced.xml   | 105 ++-------------------
 1 file changed, 8 insertions(+), 97 deletions(-)

(limited to 'indra/newview/skins/default')

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 1d508b2e36..b102007806 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
@@ -612,51 +612,6 @@
     top_delta="16"
     width="300" />
 
-  <slider
-    control_name="RenderTerrainDetail"
-    follows="left|top"
-    height="16"
-    label="Terrain Detail:"
-    label_width="165"
-    layout="topleft"
-    left="440"
-    show_text="false"
-    initial_value="0"
-    increment="1"
-    min_val="0"
-    max_val="1"
-    name="TerrainDetail"
-    top_delta="16"
-    width="280" >
-    <slider.commit_callback
-      function="Pref.UpdateSliderText"
-      parameter="TerrainDetail" />
-  </slider>
-  <text
-    type="string"
-    length="1"
-    follows="left|top"
-    height="16"
-    layout="topleft"
-    top_delta="0"
-    left_delta="284"
-    name="TerrainDetailText"
-    text_readonly_color="LabelDisabledColor"
-    width="65">
-       Low
-  </text>
-
-  <check_box
-    control_name="RenderAvatarCloth"
-    height="16"
-    initial_value="true"
-    label="Avatar cloth"
-    layout="topleft"
-    left="440"
-    name="AvatarCloth"
-    top_delta="16"
-    width="280" />
-
   <text
     type="string"
     length="1"
@@ -666,7 +621,7 @@
     name="ReflectionsText"
     text_readonly_color="LabelDisabledColor"
     top_delta="16"
-    left="440"
+    left="420"
     width="128">
        Water Reflections:
   </text>
@@ -708,20 +663,6 @@
         value="4"/>
   </combo_box>
 
-  <check_box
-    control_name="WindLightUseAtmosShaders"
-    height="16"
-    initial_value="true"
-    label="Atmospheric shaders"
-    layout="topleft"
-    left="440"
-    name="WindLightUseAtmosShaders"
-    top_delta="16"
-    width="280">
-    <check_box.commit_callback
-      function="Pref.RenderOptionUpdate" />
-  </check_box>
-
   <slider
     control_name="WLSkyDetail"
     decimal_digits="0"
@@ -732,7 +673,7 @@
     label="Sky:"
     label_width="145"
     layout="topleft"
-    left="460"
+    left="420"
     min_val="16"
     max_val="128"
     name="SkyMeshDetail"
@@ -757,27 +698,13 @@
        Low
   </text>
 
-  <check_box
-    control_name="RenderDeferred"
-    height="16"
-    initial_value="true"
-    label="Advanced Lighting Model"
-    layout="topleft"
-    left="460"
-    name="UseLightShaders"
-    top_delta="16"
-    width="260">
-    <check_box.commit_callback
-      function="Pref.RenderOptionUpdate" />
-  </check_box>
-
   <check_box
     control_name="RenderDeferredSSAO"
     height="16"
     initial_value="true"
     label="Ambient Occlusion"
     layout="topleft"
-    left="480"
+    left="420"
     name="UseSSAO"
     top_delta="16"
     width="240">
@@ -791,7 +718,7 @@
     initial_value="true"
     label="Depth of Field"
     layout="topleft"
-    left="480"
+    left="420"
     name="UseDoF"
     top_delta="16"
     width="240">
@@ -799,29 +726,13 @@
       function="Pref.RenderOptionUpdate" />
   </check_box>
 
-  <!--
-  <check_box
-    control_name="RenderUseAdvancedAtmospherics"
-    height="16"
-    initial_value="true"
-    label="Advanced Atmospherics"
-    layout="topleft"
-    left="480"
-    name="UseAdvancedAtmo"
-    top_delta="16"
-    width="240">
-    <check_box.commit_callback
-      function="Pref.AdvancedAtmosphericsEnable" />
-  </check_box>
-  -->
-
   <text
     type="string"
     length="1"
     follows="left|top"
     height="16"
     layout="topleft"
-    left="480"
+    left="420"
     name="RenderShadowDetailText"
     text_readonly_color="LabelDisabledColor"
     top_delta="16"
@@ -855,7 +766,7 @@
     follows="left|top"
     height="16"
     layout="topleft"
-    left="480"
+    left="420"
     name="RenderReflectionDetailText"
     text_readonly_color="LabelDisabledColor"
     top_delta="16"
@@ -891,7 +802,7 @@
       layout="topleft"
       left="13"
       name="horiz_border"
-      top_pad="21"
+      top="338"
       top_delta="5"
       width="774"/>
   <button
@@ -901,7 +812,7 @@
     layout="topleft"
     left="20"
     name="Defaults"
-    top_delta="10"
+    top_delta="20"
     width="210">
     <button.commit_callback
       function="Pref.HardwareDefaults" />
-- 
cgit v1.2.3


From 92b09e3a164e59f5a0c4e436d044590513ddc6bd Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 3 Aug 2022 10:41:08 -0500
Subject: SL-17706 Deprecate RenderGamma and RenderFogRatio and remove dead UI
 from graphics preferences.

---
 .../en/floater_preferences_graphics_advanced.xml   | 46 ----------------------
 1 file changed, 46 deletions(-)

(limited to 'indra/newview/skins/default')

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 b102007806..b7708b057d 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
@@ -289,52 +289,6 @@
     top_delta="16"
     width="335" />
 
-  <slider
-    control_name="RenderFogRatio"
-    follows="left|top"
-    height="16"
-    initial_value="4"
-    decimal_digits="1"
-    label="Fog Distance Ratio:"
-    label_width="185"
-    layout="topleft"
-    left="30"
-    name="fog"
-    min_val="0.5"
-    max_val="10"
-    increment="0.1"
-    top_delta="16"
-    width="332" />
-
-  <slider
-    control_name="RenderGamma"
-    follows="left|top"
-    height="16"
-    initial_value="1"
-    decimal_digits="2"
-    label="Gamma:"
-    label_width="185"
-    layout="topleft"
-    left="30"
-    name="gamma"
-    min_val="0"
-    max_val="2"
-    increment="0.01"
-    top_delta="16"
-    width="332" />
-  <text
-    type="string"
-    length="1"
-    follows="left|top"
-    height="16"
-    layout="topleft"
-    left="30"
-    name="(brightness, lower is brighter)"
-    top_delta="16"
-    width="260">
-      (0 = default brightness, lower = brighter)
-  </text>
-
   <check_box
     control_name="RenderAnisotropic"
     height="16"
-- 
cgit v1.2.3


From aca495c8812d49a5fde80ecefbf3f609b4042bf9 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 5 Aug 2022 13:13:14 +0300
Subject: Fixed tools floater dimentions after merge

---
 indra/newview/skins/default/xui/en/floater_tools.xml       | 4 ++--
 indra/newview/skins/default/xui/en/panel_tools_texture.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 3471d4b7b1..8f2acc8df4 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2,7 +2,7 @@
 <floater
  positioning="cascading"
  legacy_header_height="18"
- height="609"
+ height="651"
  layout="topleft"
  bg_opaque_image="Window_NoTitle_Foreground"
  bg_alpha_image="Window_NoTitle_Background"
@@ -820,7 +820,7 @@
     width="282"/>
     <tab_container
      follows="left|top"
-     height="426"
+     height="471"
      halign="center"
      left="0"
      name="Object Info Tabs"
diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index c8f5a66661..326fb27915 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -847,7 +847,7 @@
              decouple_texture_size="true" />
       <button
        left="90"
-       top="222"
+       top="227"
        height="20"
        label="Save as Material"
        label_selected="Save current face as a Material"
@@ -866,7 +866,7 @@
              label="Material UUID"
              name="materialID"
              select_on_focus="true"
-             top="380"
+             top="405"
              width="200"
              tool_tip="UUID for a material asset"
              />
-- 
cgit v1.2.3


From 3e7946bbbf905418595b0632388fb3de4d673312 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 5 Aug 2022 23:36:13 +0300
Subject: SL-17888 Clamp some gltf material values

---
 indra/newview/skins/default/xui/en/floater_material_editor.xml | 5 ++++-
 indra/newview/skins/default/xui/en/floater_tools.xml           | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml
index 74adc86126..0a05a4f868 100644
--- a/indra/newview/skins/default/xui/en/floater_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -111,6 +111,7 @@
                layout="topleft"
                left_delta="0"
                top_pad="5"
+               min_val="0"
                max_val="1"
                name="transparency"
               width="64"
@@ -169,6 +170,7 @@
                layout="topleft"
                left_delta="0"
                top_pad="5"
+               min_val="0"
                max_val="1"
                name="alpha cutoff"
               width="64"
@@ -245,6 +247,7 @@
              layout="topleft"
              left_delta="0"
              top_pad="5"
+             min_val="0"
              max_val="1"
              name="metalness factor"
             width="64"
@@ -270,7 +273,7 @@
                layout="topleft"
                left_delta="0"
                top_pad="5"
-               
+               min_val="0"
                max_val="1"
                name="roughness factor"
               width="64"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 8f2acc8df4..4700488197 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -820,7 +820,7 @@
     width="282"/>
     <tab_container
      follows="left|top"
-     height="471"
+     height="476"
      halign="center"
      left="0"
      name="Object Info Tabs"
@@ -2749,7 +2749,7 @@ even though the user gets a free copy.
              border_visible="true"
              bevel_style="in"
              follows="left|top|right"
-             height="335"
+             height="387"
              layout="topleft"
              left="10"
              name="contents_inventory"
-- 
cgit v1.2.3


From 963566821d95d30856cd028983d929fab89f542a Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Mon, 8 Aug 2022 14:55:15 -0500
Subject: SL-17927 Keep people from shooting themselves in the foot by
 twiddling deprecated settings.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index d3b13bfc2a..beb5a5048d 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3119,18 +3119,6 @@ function="World.EnvPreset"
             </menu_item_check>
           <menu_item_separator />
 
-          <menu_item_check
-                       label="Advanced Lighting Model"
-                       name="Advanced Lighting Model">
-            <menu_item_check.on_check
-             function="CheckControl"
-             parameter="RenderDeferred" />
-            <menu_item_check.on_click
-             function="ToggleControl"
-             parameter="RenderDeferred" />
-            <menu_item_check.on_enable
-                 function="Advanced.EnableRenderDeferred" />
-          </menu_item_check>
           <menu_item_check
                        label="   Shadows from Sun/Moon/Projectors"
                        name="Shadows from Sun/Moon/Projectors">
-- 
cgit v1.2.3


From 3b416b3e98fe80b1d9b26352551e2d5860016b78 Mon Sep 17 00:00:00 2001
From: Callum Linden <callum@lindenlab.com>
Date: Mon, 8 Aug 2022 16:40:25 -0700
Subject: SL-17695 Give materials and textures imported by Material Editor a
 sensible name - first pass - likely need to be refined but may be good enough
 for now

---
 indra/newview/skins/default/xui/en/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4169929be8..4b094da805 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4264,6 +4264,9 @@ name="Command_360_Capture_Tooltip">Capture a 360 equirectangular image</string>
   <string name="ExperiencePermissionShort16">Sit</string>
   <string name="ExperiencePermissionShort17">Environment</string>
 
+  <!-- PBR Materials -->
+  <string name="Material Texture Name Header">Textures present this material: </string>
+  
   <!-- Conversation log messages -->
   <string name="logging_calls_disabled_log_empty">
     Conversations are not being logged. To begin keeping a log, choose "Save: Log only" or "Save: Log and transcripts" under Preferences > Chat.
-- 
cgit v1.2.3


From f842aeac30c1b3abad76201d5c5f9318fd0c960e Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Wed, 17 Aug 2022 10:29:33 -0700
Subject: SL-17699 Add upport for materials to texture picker.  A work in
 progress but I am about to make some larger changes to inventory code so I
 wanted to secure this first

---
 .../skins/default/xui/en/floater_texture_ctrl.xml  | 30 +++++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index 3a66911389..7d23034a09 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -137,7 +137,29 @@
      value="Preview Disabled"
      word_wrap="true"
      visible="false"
-     width="87" />
+     width="87" />  
+    <combo_box
+      follows="left|top|right"
+      height="23"
+      label="Choose Textures, Materials or LIFE!"
+      layout="topleft"
+      left="175"
+      name="textures_material_combo"
+      top="20"
+      width="231">
+      <combo_box.item
+       label="Materials &amp; Textures"
+       name="Materials_Textures"
+       value="0" />
+      <combo_box.item
+       label="Textures"
+       name="Textures"
+       value="1" />
+      <combo_box.item
+       label="Materials"
+       name="Materials"
+       value="2" />
+    </combo_box>
     <filter_editor
      follows="left|top|right"
      height="23"
@@ -145,15 +167,15 @@
      layout="topleft"
      left="175"
      name="inventory search editor"
-     top="20"
+     top="48"
      width="231" />
-    <asset_filtered_inv_panel
+    <inventory_panel
      allow_multi_select="false"
      bg_visible="true"
      bg_alpha_color="DkGray2"
      border="false"
      follows="all"
-     height="233"
+     height="195"
      layout="topleft"
      left_delta="0"
      name="inventory panel"
-- 
cgit v1.2.3


From 0550569299d1030ca368c2fd45750236e2ee7793 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Wed, 17 Aug 2022 11:01:23 -0700
Subject: SL-17699 Add upport for materials to texture picker.  A work in
 progress but I am about to make some larger changes to inventory code so I
 wanted to secure this first (missed a change)

---
 indra/newview/skins/default/xui/en/floater_texture_ctrl.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index 7d23034a09..b47ade5d98 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -169,7 +169,7 @@
      name="inventory search editor"
      top="48"
      width="231" />
-    <inventory_panel
+    <asset_filtered_inv_panel
      allow_multi_select="false"
      bg_visible="true"
      bg_alpha_color="DkGray2"
-- 
cgit v1.2.3


From 6b71300db74711bbcefb8c6c65e2f162305d068f Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Wed, 17 Aug 2022 12:20:15 -0700
Subject: SL-17699 Add upport for materials to texture picker. Temporarilyly
 change the filtered inventory panel to a regular one so that materials show
 too.  A fix for this that lets us revert to the asset_filtered version is in
 progress and will be pulled in soon - then this change too will be reverted

---
 indra/newview/skins/default/xui/en/floater_texture_ctrl.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index b47ade5d98..7d23034a09 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -169,7 +169,7 @@
      name="inventory search editor"
      top="48"
      width="231" />
-    <asset_filtered_inv_panel
+    <inventory_panel
      allow_multi_select="false"
      bg_visible="true"
      bg_alpha_color="DkGray2"
-- 
cgit v1.2.3


From 339e1d200f7fd5f8be715722369295220da2079b Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Wed, 17 Aug 2022 13:49:10 -0700
Subject: SL-17699 Add upport for materials to texture picker: restore the
 asset filtered inventory panel and pull in @Caladbolg's fix to make it work
 with more than 1 asset type from here
 https://bitbucket.org/lindenlab/viewer/commits/0ab6dfa12eb04238d82c7a4aea7390cbd28beacd

---
 indra/newview/skins/default/xui/en/floater_my_environments.xml | 2 +-
 indra/newview/skins/default/xui/en/floater_settings_picker.xml | 2 +-
 indra/newview/skins/default/xui/en/floater_texture_ctrl.xml    | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml
index 6aff387dcb..db81c8bba2 100644
--- a/indra/newview/skins/default/xui/en/floater_my_environments.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml
@@ -119,7 +119,7 @@
                        follows="all"
                        layout="topleft"
                        name="pnl_settings"
-                       filter_asset_type="settings"/>
+                       filter_asset_types="settings"/>
             </panel>
         </layout_panel>
         <layout_panel
diff --git a/indra/newview/skins/default/xui/en/floater_settings_picker.xml b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
index 3a26c3b547..8931269fe7 100644
--- a/indra/newview/skins/default/xui/en/floater_settings_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
@@ -89,7 +89,7 @@
                     top="1"
                     right="-4"
                     bottom="-1"
-                    filter_asset_type="settings" />
+                    filter_asset_types="settings" />
             </panel>
         </layout_panel>
         <layout_panel name="pnl_combo"
diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index 7d23034a09..5ab31b404e 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -169,8 +169,8 @@
      name="inventory search editor"
      top="48"
      width="231" />
-    <inventory_panel
-     allow_multi_select="false"
+  <asset_filtered_inv_panel
+   allow_multi_select="false"
      bg_visible="true"
      bg_alpha_color="DkGray2"
      border="false"
@@ -181,7 +181,7 @@
      name="inventory panel"
      top_pad="4"
      width="231"
-     filter_asset_type="texture"/>
+     filter_asset_types="texture|material"/>
      <check_box
      height="14"
      initial_value="false"
-- 
cgit v1.2.3


From 0d217dc73c6530dcbceb306c4609e2d72da6d70b Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 20 Aug 2022 01:04:42 +0300
Subject: SL-17653 Local gltf materials #2

---
 indra/newview/skins/default/xui/en/floater_texture_ctrl.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index 5ab31b404e..a1b614d1af 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -240,6 +240,7 @@
      multi_select="true"
      search_column="1"
      visible="false">
+        <column name="icon" label="" width="20" />
         <column name="unit_name" label="Name" dynamicwidth="true" />
         <column name="unit_id_HIDDEN" label="ID" width="0" />
     </scroll_list>
-- 
cgit v1.2.3


From 8a91c1394745a28cb78e7432eaa481b6cedd7408 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 22 Aug 2022 22:11:58 +0300
Subject: SL-17653 Local gltf materials #3

---
 indra/newview/skins/default/xui/en/floater_texture_ctrl.xml | 1 -
 indra/newview/skins/default/xui/en/notifications.xml        | 9 +++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index a1b614d1af..18c226ed58 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -242,7 +242,6 @@
      visible="false">
         <column name="icon" label="" width="20" />
         <column name="unit_name" label="Name" dynamicwidth="true" />
-        <column name="unit_id_HIDDEN" label="ID" width="0" />
     </scroll_list>
 
 <!-- middle: bake mode -->
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 24a934fbb8..c618c5bf32 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9802,6 +9802,15 @@ Attempted to add an invalid or unreadable image file [FNAME] which could not be
 Attempt cancelled.
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="LocalGLTFVerifyFail"
+   persist="true"
+   type="notify">
+Attempted to add an invalid or unreadable GLTF material [FNAME] which could not be opened or decoded.
+Attempt cancelled.
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="PathfindingReturnMultipleItems"
-- 
cgit v1.2.3


From 03d012d46cbcc6d67f6241ce66649e92688f246f Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 30 Aug 2022 14:42:04 -0500
Subject: SL-18038 Remove placeholder "save as material" button

---
 .../skins/default/xui/en/panel_tools_texture.xml   | 25 ----------------------
 1 file changed, 25 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 326fb27915..2af7ccaa7a 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -845,29 +845,4 @@
              height="4"
              start_url="about:blank"
              decouple_texture_size="true" />
-      <button
-       left="90"
-       top="227"
-       height="20"
-       label="Save as Material"
-       label_selected="Save current face as a Material"
-       layout="topleft"
-       name="button save material"
-       top_delta="0"
-       tool_tip="Save material to inventory"
-       width="110" />
-
-            <line_editor
-             enabled="true"
-             follows="top|left"
-             height="16"
-             layout="topleft"
-             left="7"
-             label="Material UUID"
-             name="materialID"
-             select_on_focus="true"
-             top="405"
-             width="200"
-             tool_tip="UUID for a material asset"
-             />
 </panel>
-- 
cgit v1.2.3


From 8eaee1f033d9dac892e749cc65416e149021d8f6 Mon Sep 17 00:00:00 2001
From: Ptolemy <ptolemy@lindenlab.com>
Date: Tue, 30 Aug 2022 20:35:15 -0700
Subject: SL-17703: PBR: Fix albedo being in wrong color space, add support for
 debug default_irradiance.png

---
 .../skins/default/textures/default_irradiance.png       | Bin 0 -> 48853 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/default_irradiance.png

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/textures/default_irradiance.png b/indra/newview/skins/default/textures/default_irradiance.png
new file mode 100644
index 0000000000..899e0ddf2a
Binary files /dev/null and b/indra/newview/skins/default/textures/default_irradiance.png differ
-- 
cgit v1.2.3


From 8df1856f84cf2d76b207ab43b05f1f930db50c51 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 31 Aug 2022 22:42:52 +0300
Subject: SL-17653 In texture picker cleaned up permanently invisible 'show
 folders' checkbox

---
 indra/newview/skins/default/xui/en/floater_texture_ctrl.xml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index 18c226ed58..2a84fece03 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -175,22 +175,13 @@
      bg_alpha_color="DkGray2"
      border="false"
      follows="all"
-     height="195"
+     height="200"
      layout="topleft"
      left_delta="0"
      name="inventory panel"
      top_pad="4"
      width="231"
      filter_asset_types="texture|material"/>
-     <check_box
-     height="14"
-     initial_value="false"
-     label="Show folders"
-     layout="topleft"
-     name="show_folders_check"
-     top_pad="0"
-     left_delta="-3"
-     width="200" />
 
 <!--  middle: local mode -->
     <button
-- 
cgit v1.2.3


From 20dc30450cb50d08e6c7d23613a6a59aae1a6a16 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 31 Aug 2022 19:45:23 +0300
Subject: SL-17999 PBR material in tool's texture tab

---
 .../skins/default/xui/en/panel_tools_texture.xml   | 48 ++++++++++++++++++++++
 1 file changed, 48 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 2af7ccaa7a..922c58fa94 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -143,6 +143,10 @@
                  label="Materials"
                  name="Materials"
                  value="Materials" />
+                <combo_box.item
+                 label="PBR"
+                 name="PBR"
+                 value="PBR" />
                 <combo_box.item
                  label="Media"
                  name="Media"
@@ -179,6 +183,37 @@
                 top_pad="1"
                 value="2"/>
             </radio_group>
+            <radio_group
+            control_name="ComboMaterialType"
+            height="50"
+            layout="topleft"
+            left_delta="0"
+            top_delta="0"
+            width="150"
+            visible = "false"
+            name="radio_pbr_type">
+                <radio_item
+                label="Albedo/emissive"
+                name="Albedo/emissive"
+                top="0" 
+                layout="topleft"
+                height="16" 
+                value="0"/>
+                <radio_item
+                label="Normal"
+                layout="topleft"
+                top_pad="1" 
+                height="16" 
+                name="Normal"
+                value="1"/>
+                <radio_item
+                label="Metallic/roughness"
+                name="Metallic/roughness"
+                height="16"
+                layout="topleft"
+                top_pad="1"
+                value="2"/>
+            </radio_group>
             <menu_button
                 menu_filename="menu_copy_paste_texture.xml"
                 follows="top|left"
@@ -217,6 +252,19 @@
              tool_tip="Click to choose a picture"
              top_pad="5"
              width="64" />
+            <texture_picker
+             can_apply_immediately="true"
+             default_image_name="Default"
+             fallback_image="materials_ui_x_24.png"
+             follows="left|top"
+             height="80"
+             label="PBR       "
+             layout="topleft"
+             left="10"
+             name="pbr_control"
+             tool_tip="Click to choose a pbr material"
+             top_delta="0"
+             width="64" />
             <text
              type="string"
              length="1"
-- 
cgit v1.2.3


From 116bd660b65cfad64c6f9635db165cff5b3eda36 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 31 Aug 2022 23:39:36 +0300
Subject: SL-17653 Finalized texure picker's local filtering

---
 .../skins/default/xui/en/floater_texture_ctrl.xml  | 118 +++++++++++++--------
 1 file changed, 73 insertions(+), 45 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index 2a84fece03..b6a2aaf31b 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -137,51 +137,79 @@
      value="Preview Disabled"
      word_wrap="true"
      visible="false"
-     width="87" />  
-    <combo_box
-      follows="left|top|right"
-      height="23"
-      label="Choose Textures, Materials or LIFE!"
-      layout="topleft"
-      left="175"
-      name="textures_material_combo"
-      top="20"
-      width="231">
-      <combo_box.item
-       label="Materials &amp; Textures"
-       name="Materials_Textures"
-       value="0" />
-      <combo_box.item
-       label="Textures"
-       name="Textures"
-       value="1" />
-      <combo_box.item
-       label="Materials"
-       name="Materials"
-       value="2" />
-    </combo_box>
-    <filter_editor
-     follows="left|top|right"
-     height="23"
-     label="Filter Textures"
-     layout="topleft"
-     left="175"
-     name="inventory search editor"
-     top="48"
-     width="231" />
-  <asset_filtered_inv_panel
-   allow_multi_select="false"
-     bg_visible="true"
-     bg_alpha_color="DkGray2"
-     border="false"
-     follows="all"
-     height="200"
-     layout="topleft"
-     left_delta="0"
-     name="inventory panel"
-     top_pad="4"
-     width="231"
-     filter_asset_types="texture|material"/>
+     width="87" />
+
+  <layout_stack name="inventory_stack"
+                width="231"
+                height="276"
+                top="20"
+                left="175"
+                follows="all"
+                animate="false"
+                orientation="vertical">
+    <layout_panel name="combo_layout"
+                  border="false"
+                  bevel_style="in"
+                  auto_resize="false"
+                  user_resize="false"
+                  visible="false"
+                  width="231"
+                  height="24">
+        <combo_box
+          follows="left|top|right"
+          height="23"
+          label="Choose Textures, Materials or LIFE!"
+          layout="topleft"
+          left="0"
+          name="textures_material_combo"
+          top="0"
+          width="231">
+          <combo_box.item
+           label="Materials &amp; Textures"
+           name="Materials_Textures"
+           value="0" />
+          <combo_box.item
+           label="Textures"
+           name="Textures"
+           value="1" />
+          <combo_box.item
+           label="Materials"
+           name="Materials"
+           value="2" />
+        </combo_box>
+    </layout_panel>
+    <layout_panel name="inventory_layout"
+                  border="false"
+                  bevel_style="in"
+                  auto_resize="true"
+                  user_resize="false"
+                  visible="true"
+                  width="231"
+                  height="252">
+      <filter_editor
+       follows="left|top|right"
+       height="23"
+       label="Filter Textures"
+       layout="topleft"
+       left="0"
+       name="inventory search editor"
+       top="4"
+       width="231" />
+      <asset_filtered_inv_panel
+       allow_multi_select="false"
+       bg_visible="true"
+       bg_alpha_color="DkGray2"
+       border="false"
+       follows="all"
+       height="221"
+       layout="topleft"
+       left_delta="0"
+       name="inventory panel"
+       top_pad="4"
+       width="231"
+       filter_asset_types="texture|material"/>
+    </layout_panel>
+  </layout_stack>
 
 <!--  middle: local mode -->
     <button
-- 
cgit v1.2.3


From 01cf98cec94b3b08bf56d63f994eab66d33daf5b Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 1 Sep 2022 22:15:53 +0300
Subject: SL-18039 Added scroll into material editor

---
 .../default/xui/en/floater_material_editor.xml     | 767 +++++++++++----------
 1 file changed, 396 insertions(+), 371 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml
index 0a05a4f868..eda28c5a4b 100644
--- a/indra/newview/skins/default/xui/en/floater_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -1,355 +1,378 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- can_resize="false"
+ can_resize="true"
  default_tab_group="1"
  height="887"
+ width="256"
+ min_height="500"
+ min_width="256"
  layout="topleft"
  name="material editor"
  help_topic="material_editor"
- title="[MATERIAL_NAME]"
- width="256">
+ title="[MATERIAL_NAME]">
   <string name="no_upload_fee_string">no upload fee</string>
   <string name="upload_fee_string">L$[FEE] upload fee</string>
-  <check_box
-          follows="left|top"
-          label="Double Sided"
-          left="14"
-          top="14"
-          name="double sided"
-          height="25"
-          width="120" />
-  <panel
-    border="true"
-         follows="left|top"
-         width="246"
-         height="196"
-         layout="topleft"
-         left="5"
-         mouse_opaque="false"
-         name="albedo_texture_pnl"
-         top_pad="5"
-         >
-  <text
-             type="string"
-             font.style="BOLD"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="10"
-             top="5"
-             width="64">
-    Albedo:
-  </text>
-    <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             fallback_image="materials_ui_x_24.png"
-             allow_no_texture="true"
+
+  <scroll_container
+   name="materials_scroll"
+   top="14"
+   left="4"
+   height="768"
+   width="247"
+   follows="all"
+   layout="topleft"
+   color="DkGray2"
+   opaque="true"
+   reserve_scroll_corner="false"
+      >
+    <panel
+      border="false"
+      name="scroll_panel"
+      top="0"
+      left="0"
+      height="768"
+      width="247"
+        >
+      <check_box
+              follows="left|top"
+              label="Double Sided"
+              left="10"
+              top="0"
+              name="double sided"
+              height="25"
+              width="120" />
+      <panel
+        border="true"
              follows="left|top"
-             top_pad="8"
-             height="151"
+             width="246"
+             height="196"
              layout="topleft"
-             left="10"
-             name="albedo_texture"
-             tool_tip="Albedo map.  Alpha channel is optional and used for transparency."
-             width="128" />
-    <text
-               type="string"
-               font.style="BOLD"
-               length="1"
-               follows="left|top"
-               height="10"
-               width="128"
-               layout="topleft"
-               left="10"
-               top_pad="-17"
-               name="albedo_upload_fee"
+             left="1"
+             mouse_opaque="false"
+             name="albedo_texture_pnl"
+             top_pad="5"
+         >
+        <text
+                   type="string"
+                   font.style="BOLD"
+                   length="1"
+                   follows="left|top"
+                   height="10"
+                   layout="topleft"
+                   left="10"
+                   top="5"
+                   width="64">
+          Albedo:
+        </text>
+        <texture_picker
+                 can_apply_immediately="true"
+                 default_image_name="Default"
+                 fallback_image="materials_ui_x_24.png"
+                 allow_no_texture="true"
+                 follows="left|top"
+                 top_pad="8"
+                 height="151"
+                 layout="topleft"
+                 left="10"
+                 name="albedo_texture"
+                 tool_tip="Albedo map.  Alpha channel is optional and used for transparency."
+                 width="128" />
+        <text
+                   type="string"
+                   font.style="BOLD"
+                   length="1"
+                   follows="left|top"
+                   height="10"
+                   width="128"
+                   layout="topleft"
+                   left="10"
+                   top_pad="-17"
+                   name="albedo_upload_fee"
              >
-      No upload fee
-    </text>
-  <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_pad="5"
-             top="8"
+          No upload fee
+        </text>
+        <text
+                   type="string"
+                   length="1"
+                   follows="left|top"
+                   height="10"
+                   layout="topleft"
+                   left_pad="5"
+                   top="8"
              >
-    Tint
-  </text>
-  <color_swatch
-                    can_apply_immediately="true"
-                    follows="left|top"
-                    height="40"
-                    label_height="0"
-                    layout="topleft"
-                    left_delta="0"
-                    top_pad="5"
-                    name="albedo color"
-                    width="40" />
-    <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_delta="0"
-             top_pad="5"
-             width="96"
+          Tint
+        </text>
+        <color_swatch
+                          can_apply_immediately="true"
+                          follows="left|top"
+                          height="40"
+                          label_height="0"
+                          layout="topleft"
+                          left_delta="0"
+                          top_pad="5"
+                          name="albedo color"
+                          width="40" />
+        <text
+                 type="string"
+                 length="1"
+                 follows="left|top"
+                 height="10"
+                 layout="topleft"
+                 left_delta="0"
+                 top_pad="5"
+                 width="96"
              >
-      Transparency
-    </text>
-    <spinner
-               decimal_digits="3"
-               follows="left|top"
-               height="19"
-               increment="0.01"
-               initial_value="1"
-               layout="topleft"
-               left_delta="0"
-               top_pad="5"
-               min_val="0"
-               max_val="1"
-               name="transparency"
-              width="64"
+          Transparency
+        </text>
+        <spinner
+                   decimal_digits="3"
+                   follows="left|top"
+                   height="19"
+                   increment="0.01"
+                   initial_value="1"
+                   layout="topleft"
+                   left_delta="0"
+                   top_pad="5"
+                   min_val="0"
+                   max_val="1"
+                   name="transparency"
+                  width="64"
              />
-    <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_delta="0"
-             name="label alphamode"
-             text_readonly_color="LabelDisabledColor"
-             top_pad="5"
-             width="90">
-      Alpha mode
-    </text>
-    <combo_box
-     height="23"
-     layout="topleft"
-     left_delta="0"
-     name="alpha mode"
-     top_pad="4"
-     width="96">
-      <combo_box.item
-       label="None"
-       name="None"
-       value="OPAQUE" />
-      <combo_box.item
-       label="Alpha blending"
-       name="Alpha blending"
-       value="BLEND" />
-      <combo_box.item
-       label="Alpha masking"
-       name="Alpha masking"
-       value="MASK" />
-    </combo_box>
-    <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_delta="0"
-             top_pad="5"
-             width="96"
+        <text
+                 type="string"
+                 length="1"
+                 follows="left|top"
+                 height="10"
+                 layout="topleft"
+                 left_delta="0"
+                 name="label alphamode"
+                 text_readonly_color="LabelDisabledColor"
+                 top_pad="5"
+                 width="90">
+          Alpha mode
+        </text>
+        <combo_box
+         height="23"
+         layout="topleft"
+         left_delta="0"
+         name="alpha mode"
+         top_pad="4"
+         width="96">
+          <combo_box.item
+           label="None"
+           name="None"
+           value="OPAQUE" />
+          <combo_box.item
+           label="Alpha blending"
+           name="Alpha blending"
+           value="BLEND" />
+          <combo_box.item
+           label="Alpha masking"
+           name="Alpha masking"
+           value="MASK" />
+        </combo_box>
+        <text
+                 type="string"
+                 length="1"
+                 follows="left|top"
+                 height="10"
+                 layout="topleft"
+                 left_delta="0"
+                 top_pad="5"
+                 width="96"
              >
-      Alpha Cutoff
-    </text>
-    <spinner
-               decimal_digits="3"
-               follows="left|top"
-               height="19"
-               increment="0.01"
-               initial_value="1"
-               layout="topleft"
-               left_delta="0"
-               top_pad="5"
-               min_val="0"
-               max_val="1"
-               name="alpha cutoff"
-              width="64"
+          Alpha Cutoff
+        </text>
+        <spinner
+                   decimal_digits="3"
+                   follows="left|top"
+                   height="19"
+                   increment="0.01"
+                   initial_value="1"
+                   layout="topleft"
+                   left_delta="0"
+                   top_pad="5"
+                   min_val="0"
+                   max_val="1"
+                   name="alpha cutoff"
+                  width="64"
              />
-  </panel>
-  <panel
-    border="true"
-         follows="left|top"
-         width="246"
-         height="175"
-         layout="topleft"
-         left="5"
-         mouse_opaque="false"
-         name="metallic_texture_pnl"
-         top_pad="5"
-         >
-    <text
-             type="string"
-             font.style="BOLD"
-             length="1"
+      </panel>
+      <panel
+        border="true"
              follows="left|top"
-             height="10"
+             width="246"
+             height="175"
              layout="topleft"
-             left="10"
-             top="5"
+             left="1"
+             mouse_opaque="false"
+             name="metallic_texture_pnl"
+             top_pad="5"
+         >
+        <text
+                 type="string"
+                 font.style="BOLD"
+                 length="1"
+                 follows="left|top"
+                 height="10"
+                 layout="topleft"
+                 left="10"
+                 top="5"
              >
-    Metallic-Roughness:
-  </text>
-    <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             fallback_image="materials_ui_x_24.png"
-             allow_no_texture="true"
-             follows="left|top"
-             width="128" 
-             height="151"
-             layout="topleft"
-             left="10"
-             name="metallic_roughness_texture"
-             tool_tip="GLTF metallic-roughness map with optional occlusion.  Red channel is occlusion, green channel is roughness, blue channel is metalness."
-             top_pad="8"
+          Metallic-Roughness:
+        </text>
+        <texture_picker
+                 can_apply_immediately="true"
+                 default_image_name="Default"
+                 fallback_image="materials_ui_x_24.png"
+                 allow_no_texture="true"
+                 follows="left|top"
+                 width="128"
+                 height="151"
+                 layout="topleft"
+                 left="10"
+                 name="metallic_roughness_texture"
+                 tool_tip="GLTF metallic-roughness map with optional occlusion.  Red channel is occlusion, green channel is roughness, blue channel is metalness."
+                 top_pad="8"
              />
-  <text
-             type="string"
-             font.style="BOLD"
-             length="1"
-             follows="left|top"
-             height="10"
-             width="128"
-             layout="topleft"
-             left="10"
-             top_pad="-17"
-             name="metallic_upload_fee"
+        <text
+                   type="string"
+                   font.style="BOLD"
+                   length="1"
+                   follows="left|top"
+                   height="10"
+                   width="128"
+                   layout="topleft"
+                   left="10"
+                   top_pad="-17"
+                   name="metallic_upload_fee"
            >
-    No upload fee
-  </text>
-  <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_pad="5"
-             top="8"
+          No upload fee
+        </text>
+        <text
+                   type="string"
+                   length="1"
+                   follows="left|top"
+                   height="10"
+                   layout="topleft"
+                   left_pad="5"
+                   top="8"
              >
-    Metallic Factor
-  </text>
-  <spinner
-             decimal_digits="3"
-             follows="left|top"
-             height="19"
-             increment="0.01"
-             initial_value="0"
-             layout="topleft"
-             left_delta="0"
-             top_pad="5"
-             min_val="0"
-             max_val="1"
-             name="metalness factor"
-            width="64"
+          Metallic Factor
+        </text>
+        <spinner
+                   decimal_digits="3"
+                   follows="left|top"
+                   height="19"
+                   increment="0.01"
+                   initial_value="0"
+                   layout="topleft"
+                   left_delta="0"
+                   top_pad="5"
+                   min_val="0"
+                   max_val="1"
+                   name="metalness factor"
+                  width="64"
              />
-    <text
-             type="string"
-             length="1"
+        <text
+                 type="string"
+                 length="1"
+                 follows="left|top"
+                 height="10"
+                 layout="topleft"
+                 left_delta="0"
+                 top_pad="5"
+                 width="96"
+             >
+          Roughness Factor
+        </text>
+        <spinner
+                   decimal_digits="3"
+                   follows="left|top"
+                   height="19"
+                   increment="0.01"
+                   initial_value="0"
+                   layout="topleft"
+                   left_delta="0"
+                   top_pad="5"
+                   min_val="0"
+                   max_val="1"
+                   name="roughness factor"
+                  width="64"
+             />
+      </panel>
+      <panel
+        border="true"
              follows="left|top"
-             height="10"
+             width="246"
+             height="175"
              layout="topleft"
-             left_delta="0"
+             left="1"
+             mouse_opaque="false"
+             name="emissive_texture_pnl"
              top_pad="5"
-             width="96"
-             >
-      Roughness Factor
-    </text>
-    <spinner
-               decimal_digits="3"
-               follows="left|top"
-               height="19"
-               increment="0.01"
-               initial_value="0"
-               layout="topleft"
-               left_delta="0"
-               top_pad="5"
-               min_val="0"
-               max_val="1"
-               name="roughness factor"
-              width="64"
-             />
-  </panel>
-  <panel
-    border="true"
-         follows="left|top"
-         width="246"
-         height="175"
-         layout="topleft"
-         left="5"
-         mouse_opaque="false"
-         name="emissive_texture_pnl"
-         top_pad="5"
          >
-    <text
-               type="string"
-               font.style="BOLD"
-               length="1"
-               follows="left|top"
-               height="10"
-               layout="topleft"
-               left="10"
-               top="5"
-               width="64">
-      Emissive:
-    </text>
-    <texture_picker
-               can_apply_immediately="true"
-               default_image_name="Default"
-               fallback_image="materials_ui_x_24.png"
-               allow_no_texture="true"
-               follows="left|top"
-               top_pad="8"
-               height="151"
-               layout="topleft"
-               left="10"
-               name="emissive_texture"
-               width="128" />
-    <text
-               type="string"
-               font.style="BOLD"
-               length="1"
-               follows="left|top"
-               height="10"
-               width="128"
-               layout="topleft"
-               left="10"
-               top_pad="-17"
-               name="emissive_upload_fee"
+        <text
+                   type="string"
+                   font.style="BOLD"
+                   length="1"
+                   follows="left|top"
+                   height="10"
+                   layout="topleft"
+                   left="10"
+                   top="5"
+                   width="64">
+          Emissive:
+        </text>
+        <texture_picker
+                   can_apply_immediately="true"
+                   default_image_name="Default"
+                   fallback_image="materials_ui_x_24.png"
+                   allow_no_texture="true"
+                   follows="left|top"
+                   top_pad="8"
+                   height="151"
+                   layout="topleft"
+                   left="10"
+                   name="emissive_texture"
+                   width="128" />
+        <text
+                   type="string"
+                   font.style="BOLD"
+                   length="1"
+                   follows="left|top"
+                   height="10"
+                   width="128"
+                   layout="topleft"
+                   left="10"
+                   top_pad="-17"
+                   name="emissive_upload_fee"
            >
-      No upload fee
-    </text>
-    <text
-               type="string"
-               length="1"
-               follows="left|top"
-               height="10"
-               layout="topleft"
-               left_pad="5"
-               top="8"
+          No upload fee
+        </text>
+        <text
+                   type="string"
+                   length="1"
+                   follows="left|top"
+                   height="10"
+                   layout="topleft"
+                   left_pad="5"
+                   top="8"
              >
-      Tint
-    </text>
-    <color_swatch
-                      can_apply_immediately="true"
-                      follows="left|top"
-                      height="40"
-                      label_height="0"
-                      layout="topleft"
-                      left_delta="0"
-                      top_pad="5"
-                      name="emissive color"
-                      width="40" />
-    <!--<text
+          Tint
+        </text>
+        <color_swatch
+                          can_apply_immediately="true"
+                          follows="left|top"
+                          height="40"
+                          label_height="0"
+                          layout="topleft"
+                          left_delta="0"
+                          top_pad="5"
+                          name="emissive color"
+                          width="40" />
+        <!--<text
              type="string"
              length="1"
              follows="left|top"
@@ -373,64 +396,66 @@
                max_val="100"
               width="64"
              />-->
-  </panel>
-  <panel
-    border="true"
-         follows="left|top"
-         width="246"
-         height="175"
-         layout="topleft"
-         left="5"
-         mouse_opaque="false"
-         top_pad="5"
-         name="normal_texture_pnl"
+      </panel>
+      <panel
+        border="true"
+             follows="left|top"
+             width="246"
+             height="175"
+             layout="topleft"
+             left="1"
+             mouse_opaque="false"
+             top_pad="5"
+             name="normal_texture_pnl"
          >
-    <text
-               type="string"
-               font.style="BOLD"
-               length="1"
-               follows="left|top"
-               height="10"
-               layout="topleft"
-               left="10"
-               top="5"
-               width="64">
-      Normal:
-    </text>
-    <texture_picker
-               can_apply_immediately="true"
-               default_image_name="Default"
-               fallback_image="materials_ui_x_24.png"
-               allow_no_texture="true"
-               follows="left|top"
-               top_pad="8"
-               height="151"
-               layout="topleft"
-               left="10"
-               name="normal_texture"
-               width="128" />
-    <text
-               type="string"
-               font.style="BOLD"
-               length="1"
-               follows="left|top"
-               height="10"
-               width="128"
-               layout="topleft"
-               left="10"
-               top_pad="-17"
-               name="normal_upload_fee"
+        <text
+                   type="string"
+                   font.style="BOLD"
+                   length="1"
+                   follows="left|top"
+                   height="10"
+                   layout="topleft"
+                   left="10"
+                   top="5"
+                   width="64">
+          Normal:
+        </text>
+        <texture_picker
+                   can_apply_immediately="true"
+                   default_image_name="Default"
+                   fallback_image="materials_ui_x_24.png"
+                   allow_no_texture="true"
+                   follows="left|top"
+                   top_pad="8"
+                   height="151"
+                   layout="topleft"
+                   left="10"
+                   name="normal_texture"
+                   width="128" />
+        <text
+                   type="string"
+                   font.style="BOLD"
+                   length="1"
+                   follows="left|top"
+                   height="10"
+                   width="128"
+                   layout="topleft"
+                   left="10"
+                   top_pad="-17"
+                   name="normal_upload_fee"
            >
-      No upload fee
-    </text>
-  </panel>
+          No upload fee
+        </text>
+      </panel>
+    </panel>
+  </scroll_container>
 
   <panel
          follows="right|bottom"
          width="246"
          height="97"
          layout="bottomright"
-         top_delta="-2"
+         top_pad="0"
          left="5"
          name="button_panel"
          >
-- 
cgit v1.2.3


From bded34a8615a2adceb2eda2f2d85501a70990efe Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 2 Sep 2022 19:22:49 +0300
Subject: SL-17999 PBR should reuse texture possition channels from normal
 materials

---
 indra/newview/skins/default/xui/en/panel_tools_texture.xml | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 922c58fa94..54a00da294 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -153,7 +153,6 @@
                  value="Media" />
             </combo_box>
             <radio_group
-            control_name="ComboMaterialType"
             height="50"
             layout="topleft"
             left_pad="5"
@@ -184,7 +183,6 @@
                 value="2"/>
             </radio_group>
             <radio_group
-            control_name="ComboMaterialType"
             height="50"
             layout="topleft"
             left_delta="0"
-- 
cgit v1.2.3


From caf95ed00b0d35e9071db157c68a57f09198a530 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 5 Sep 2022 12:18:26 +0300
Subject: SL-17999 Small cleanup

---
 indra/newview/skins/default/xui/en/panel_tools_texture.xml | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 54a00da294..9bdfff41d8 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -252,8 +252,6 @@
              width="64" />
             <texture_picker
              can_apply_immediately="true"
-             default_image_name="Default"
-             fallback_image="materials_ui_x_24.png"
              follows="left|top"
              height="80"
              label="PBR       "
-- 
cgit v1.2.3


From 87b55e7293d7b87650e9e792f6be6b7e894773de Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 13 Sep 2022 01:15:31 +0300
Subject: SL-17653 Removed unneeded combo box

---
 .../skins/default/xui/en/floater_texture_ctrl.xml  | 93 +++++-----------------
 1 file changed, 22 insertions(+), 71 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index b6a2aaf31b..0cb69137e3 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -139,77 +139,28 @@
      visible="false"
      width="87" />
 
-  <layout_stack name="inventory_stack"
-                width="231"
-                height="276"
-                top="20"
-                left="175"
-                follows="all"
-                animate="false"
-                orientation="vertical">
-    <layout_panel name="combo_layout"
-                  border="false"
-                  bevel_style="in"
-                  auto_resize="false"
-                  user_resize="false"
-                  visible="false"
-                  width="231"
-                  height="24">
-        <combo_box
-          follows="left|top|right"
-          height="23"
-          label="Choose Textures, Materials or LIFE!"
-          layout="topleft"
-          left="0"
-          name="textures_material_combo"
-          top="0"
-          width="231">
-          <combo_box.item
-           label="Materials &amp; Textures"
-           name="Materials_Textures"
-           value="0" />
-          <combo_box.item
-           label="Textures"
-           name="Textures"
-           value="1" />
-          <combo_box.item
-           label="Materials"
-           name="Materials"
-           value="2" />
-        </combo_box>
-    </layout_panel>
-    <layout_panel name="inventory_layout"
-                  border="false"
-                  bevel_style="in"
-                  auto_resize="true"
-                  user_resize="false"
-                  visible="true"
-                  width="231"
-                  height="252">
-      <filter_editor
-       follows="left|top|right"
-       height="23"
-       label="Filter Textures"
-       layout="topleft"
-       left="0"
-       name="inventory search editor"
-       top="4"
-       width="231" />
-      <asset_filtered_inv_panel
-       allow_multi_select="false"
-       bg_visible="true"
-       bg_alpha_color="DkGray2"
-       border="false"
-       follows="all"
-       height="221"
-       layout="topleft"
-       left_delta="0"
-       name="inventory panel"
-       top_pad="4"
-       width="231"
-       filter_asset_types="texture|material"/>
-    </layout_panel>
-  </layout_stack>
+    <filter_editor
+     follows="left|top|right"
+     height="23"
+     label="Filter Textures"
+     layout="topleft"
+     left="175"
+     name="inventory search editor"
+     top="20"
+     width="231" />
+    <asset_filtered_inv_panel
+     allow_multi_select="false"
+     bg_visible="true"
+     bg_alpha_color="DkGray2"
+     border="false"
+     follows="all"
+     height="242"
+     layout="topleft"
+     left_delta="0"
+     name="inventory panel"
+     top_pad="4"
+     width="231"
+     filter_asset_types="texture|material"/>
 
 <!--  middle: local mode -->
     <button
-- 
cgit v1.2.3


From 5d918f98eaacc0eec84edcf23a40d6f6c93807c3 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 15 Sep 2022 00:01:03 +0300
Subject: SL-18161 Add PBR materials to Uploads in preferences

---
 .../skins/default/xui/en/menu_inventory.xml        |  8 +++++++
 .../default/xui/en/panel_preferences_uploads.xml   | 25 ++++++++++++++++++++++
 2 files changed, 33 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index c7c1e1d75a..46dd0ada5d 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -692,6 +692,14 @@
          function="Inventory.FileUploadLocation"
          parameter="model" />
       </menu_item_call>
+      <menu_item_call
+       label="PBR material uploads"
+       layout="topleft"
+       name="PBR uploads">
+        <menu_item_call.on_click
+         function="Inventory.FileUploadLocation"
+         parameter="pbr_material" />
+      </menu_item_call>
     </menu>
     <menu_item_separator
      layout="topleft" />
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml b/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml
index 67eff2b762..08ff3d4d53 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml
@@ -122,6 +122,31 @@
    width="370"
    word_wrap="true"/>
 
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="12"
+   layout="topleft"
+   left="37"
+   name="title_pbr"
+   top_pad="7"
+   width="100">
+    PBR Materials
+  </text>
+  <text
+   type="string"
+   use_ellipses="true"
+   follows="left|top"
+   height="27"
+   layout="topleft"
+   font.style="BOLD"
+   left="37"
+   name="upload_pbr"
+   top_pad="5"
+   width="370"
+   word_wrap="true"/>
+
   <text
    type="string"
    length="1"
-- 
cgit v1.2.3


From 2c15c87caad8f58c1cbfef5dfe97937a1c819a73 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 15 Sep 2022 22:16:38 +0300
Subject: SL-18161 Fix missing folder name localizations

---
 indra/newview/skins/default/xui/en/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 960faabcfd..7f2a2afd26 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2467,6 +2467,8 @@ If you continue to receive this message, please contact Second Life support for
 	<string name="InvFolder Meshes">Meshes</string>
 	<string name="InvFolder Received Items">Received Items</string>
 	<string name="InvFolder Merchant Outbox">Merchant Outbox</string>
+  <string name="InvFolder Settings">Settings</string>
+  <string name="InvFolder Material">Material</string>
 
   <!-- are used for Friends and Friends/All folders in Inventory "Calling cards" folder. See EXT-694-->
 	<string name="InvFolder Friends">Friends</string>	
-- 
cgit v1.2.3


From c5dd5a0e49d08d106d28d872ce681430820585a7 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 16 Sep 2022 00:33:25 +0300
Subject: SL-18161 Change pbr folder name

---
 indra/newview/skins/default/xui/en/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 7f2a2afd26..646f4af5d1 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2468,7 +2468,7 @@ If you continue to receive this message, please contact Second Life support for
 	<string name="InvFolder Received Items">Received Items</string>
 	<string name="InvFolder Merchant Outbox">Merchant Outbox</string>
   <string name="InvFolder Settings">Settings</string>
-  <string name="InvFolder Material">Material</string>
+  <string name="InvFolder Materials">Materials</string>
 
   <!-- are used for Friends and Friends/All folders in Inventory "Calling cards" folder. See EXT-694-->
 	<string name="InvFolder Friends">Friends</string>	
-- 
cgit v1.2.3


From 8dc59e5ef37836b15d478fb0d04e3043a9f986de Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 16 Sep 2022 16:25:26 -0500
Subject: SL-18128 Clear out much OpenGL cruft and switch to core profile on
 AMD

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index eb4f9f16fa..825d1202a6 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3099,8 +3099,6 @@ function="World.EnvPreset"
                 <menu_item_check.on_click
                  function="ToggleControl"
                  parameter="UseOcclusion" />
-                <menu_item_check.on_enable
-                 function="Advanced.EnableObjectObjectOcclusion" />
             </menu_item_check>
           <menu_item_separator />
 
-- 
cgit v1.2.3


From e5d463ca200bdfa93b8c65e588d490c2f23e3918 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 22 Sep 2022 17:27:18 -0500
Subject: SL-17705 Backwards compatibility pass.  Support OpenGL pre-4.0 by
 disabling reflection probes and anti-aliasing.  Get render parity with
 current release viewer when reflection probes are disabled.

---
 .../xui/en/floater_preferences_graphics_advanced.xml       |  4 ++++
 .../skins/default/xui/en/panel_preferences_graphics1.xml   | 14 --------------
 2 files changed, 4 insertions(+), 14 deletions(-)

(limited to 'indra/newview/skins/default')

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 97a87d56f4..6ff27ad50b 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
@@ -719,6 +719,10 @@
    top_delta="0"
    name="ReflectionDetial"
    width="150">
+    <combo_box.item
+      label="Disabled"
+      name="0"
+      value="-1"/>
     <combo_box.item
       label="Static Only"
       name="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 908ddd32b5..38d364cf9a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -231,20 +231,6 @@
      m
   </text>
 
-  <check_box
-    control_name="RenderPBR"
-    height="16"
-    initial_value="true"
-    label="Physically Based Rendering"
-    layout="topleft"
-    left="30"
-    name="UsePBRShaders"
-    top_delta="24"
-    width="256">
-    <check_box.commit_callback
-      function="Pref.RenderOptionUpdate" />
-  </check_box>
-
   <slider
     control_name="IndirectMaxComplexity"
     tool_tip="Controls at what point a visually complex avatar is drawn as a JellyDoll"
-- 
cgit v1.2.3


From 8f1d22686551f4d6783d03cd3685085ed7fcb96c Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 23 Sep 2022 11:19:56 -0500
Subject: SL-18134 Rename Albedo to Base Color to be more consistent with GLTF
 spec

---
 .../skins/default/xui/en/floater_material_editor.xml       | 14 +++++++-------
 indra/newview/skins/default/xui/en/panel_tools_texture.xml |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml
index eda28c5a4b..67cbb253d9 100644
--- a/indra/newview/skins/default/xui/en/floater_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -50,7 +50,7 @@
              layout="topleft"
              left="1"
              mouse_opaque="false"
-             name="albedo_texture_pnl"
+             name="base_color_texture_pnl"
              top_pad="5"
          >
         <text
@@ -62,8 +62,8 @@
                    layout="topleft"
                    left="10"
                    top="5"
-                   width="64">
-          Albedo:
+                   width="128">
+          Base Color:
         </text>
         <texture_picker
                  can_apply_immediately="true"
@@ -75,8 +75,8 @@
                  height="151"
                  layout="topleft"
                  left="10"
-                 name="albedo_texture"
-                 tool_tip="Albedo map.  Alpha channel is optional and used for transparency."
+                 name="base_color_texture"
+                 tool_tip="Base Color map.  Alpha channel is optional and used for transparency."
                  width="128" />
         <text
                    type="string"
@@ -88,7 +88,7 @@
                    layout="topleft"
                    left="10"
                    top_pad="-17"
-                   name="albedo_upload_fee"
+                   name="base_color_upload_fee"
              >
           No upload fee
         </text>
@@ -111,7 +111,7 @@
                           layout="topleft"
                           left_delta="0"
                           top_pad="5"
-                          name="albedo color"
+                          name="base color"
                           width="40" />
         <text
                  type="string"
diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 30774ab18e..104bcb9257 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -191,8 +191,8 @@
             visible = "false"
             name="radio_pbr_type">
                 <radio_item
-                label="Albedo/emissive"
-                name="Albedo/emissive"
+                label="Color/emissive"
+                name="Color/emissive"
                 top="0" 
                 layout="topleft"
                 height="16" 
-- 
cgit v1.2.3


From 3e59ae1c43a70f41fba9cf6ba7d33aeed22d3a9f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 27 Sep 2022 17:59:27 +0300
Subject: SL-17640 Support loading materials from multi-material files

---
 .../default/xui/en/floater_combobox_ok_cancel.xml  | 48 ++++++++++++++++++++++
 .../default/xui/en/floater_material_editor.xml     |  2 +
 2 files changed, 50 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_combobox_ok_cancel.xml

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_combobox_ok_cancel.xml b/indra/newview/skins/default/xui/en/floater_combobox_ok_cancel.xml
new file mode 100644
index 0000000000..63eaffde18
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_combobox_ok_cancel.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<floater
+ legacy_header_height="18"
+ height="130"
+ min_height="130"
+ width="270"
+ min_width="270"
+ layout="topleft"
+ name="floater_combo"
+ title="floater_combo"
+ help_topic="floater_combo"
+ can_resize="false"
+ can_minimize="false">
+    <text
+     follows="top|left|right"
+     height="10"
+     layout="topleft"
+     left="20"
+     name="combo_text"
+     top="30"
+     width="200">
+     Select an option:
+    </text>
+    <combo_box
+     follows="top|left"
+     layout="topleft"
+     left="20"
+     name="combo_options"
+     top_delta="20"
+     width="230"/>
+    <button
+     follows="top|left"
+     height="23"
+     label="OK"
+     layout="topleft"
+     top_delta="40"
+     left="20"
+     name="combo_ok"
+     width="90"/>
+    <button
+     follows="top|left"
+     height="23"
+     label="Cancel"
+     layout="topleft"
+     left_pad="50"
+     name="combo_cancel"
+     width="90"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml
index 67cbb253d9..3314d49ac3 100644
--- a/indra/newview/skins/default/xui/en/floater_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -13,6 +13,8 @@
  title="[MATERIAL_NAME]">
   <string name="no_upload_fee_string">no upload fee</string>
   <string name="upload_fee_string">L$[FEE] upload fee</string>
+  <string name="material_selection_title">Material selection</string>
+  <string name="material_selection_text">Select material:</string>
 
   <scroll_container
    name="materials_scroll"
-- 
cgit v1.2.3


From 9448db5d4af7bba094e5bc51f85e5c2491d3f5a1 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 6 Oct 2022 18:40:01 -0500
Subject: SL-18190 Water shader WIP.  Better parallax correction for sphere
 probes.  Reduce probe memory footprint.  Remove framebuffer copies and move
 to deprecate stencil buffer usage.

---
 indra/newview/skins/default/xui/en/floater_build_options.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_build_options.xml b/indra/newview/skins/default/xui/en/floater_build_options.xml
index 38428b36fc..7278e55d57 100644
--- a/indra/newview/skins/default/xui/en/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_build_options.xml
@@ -46,14 +46,14 @@
      name="GridSubUnit"
      top_pad="0"
      width="200" />
-    <check_box
+    <!-- <check_box
      control_name="GridCrossSections"
      height="16"
      label="View cross-sections"
      layout="topleft"
      name="GridCrossSection"
      top_pad="5"
-     width="200" />
+     width="200" />-->
    <text
          type="string"
          length="1"
-- 
cgit v1.2.3


From 42ec639c860e172803753b9cb41ae9483305f2f8 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 12 Oct 2022 14:46:51 -0500
Subject: SL-18190 Remove water reflection detail combo box and reimplement
 "Transparent Water" checkbox.

---
 .../en/floater_preferences_graphics_advanced.xml   | 51 ----------------------
 1 file changed, 51 deletions(-)

(limited to 'indra/newview/skins/default')

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 6ff27ad50b..4a08cc5285 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
@@ -550,57 +550,6 @@
     top_delta="16"
     width="300" />
 
-  <text
-    type="string"
-    length="1"
-    follows="left|top"
-    height="16"
-    layout="topleft"
-    name="ReflectionsText"
-    text_readonly_color="LabelDisabledColor"
-    top_delta="16"
-    left="420"
-    width="128">
-       Water Reflections:
-  </text>
-  <combo_box
-    control_name="RenderReflectionDetail"
-    height="18"
-    layout="topleft"
-    left_delta="170"
-    top_delta="0"
-    name="Reflections"
-    width="150">
-      <combo_box.item
-        label="None; opaque"
-        name="0"
-        value="-2"/>
-      <combo_box.item
-        label="None; transparent"
-        name="0"
-        value="-1"/>
-      <combo_box.item
-        label="Minimal"
-        name="0"
-        value="0"/>
-      <combo_box.item
-        label="Terrain and trees"
-        name="1"
-        value="1"/>
-      <combo_box.item
-        label="All static objects"
-        name="2"
-        value="2"/>
-      <combo_box.item
-        label="All avatars and objects"
-        name="3"
-        value="3"/>
-      <combo_box.item
-        label="Everything"
-        name="4"
-        value="4"/>
-  </combo_box>
-
   <slider
     control_name="WLSkyDetail"
     decimal_digits="0"
-- 
cgit v1.2.3


From 3d170fae5d528dfbecacc913fb68c870abbf9ce2 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 13 Oct 2022 21:01:35 +0300
Subject: SL-18125 Separate GLTF permissions from normal uploads

---
 .../skins/default/xui/en/floater_perms_default.xml | 68 +++++++++++++++++++++-
 1 file changed, 66 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_perms_default.xml b/indra/newview/skins/default/xui/en/floater_perms_default.xml
index 49dc719a24..9ca61671e1 100644
--- a/indra/newview/skins/default/xui/en/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/en/floater_perms_default.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- height="250"
+ height="266"
  layout="topleft"
  name="perms default"
  help_topic="perms_default"
@@ -10,7 +10,7 @@
  width="700">
   <panel
    follows="left|top|right|bottom"
-   height="200"
+   height="216"
    label="Default Permissions"
    layout="topleft"
    left="10"
@@ -549,6 +549,70 @@
        left_pad="0"
        top_delta="0"
        width="100" />
+      <text
+       name="label_14"
+       type="string"
+       length="1"
+       follows="left|top"
+       height="16"
+       layout="topleft"
+       left="0"
+       tool_tip="Set default permissions for when GLTF Materials are created"
+       width="100">
+          Materials
+      </text>
+      <icon
+       follows="left|top"
+       height="16"
+       image_name="Inv_Material"
+       layout="topleft"
+       left_pad="2"
+       width="18"/>
+      <check_box
+       control_name="MaterialsNextOwnerCopy"
+       height="16"
+       layout="topleft"
+       name="env_material_c"
+       left_pad="45"
+       top_delta="0"
+       width="100">
+        <check_box.commit_callback
+         function="PermsDefault.Copy"
+         parameter="Materials" />
+      </check_box>
+      <check_box
+       control_name="MaterialsNextOwnerModify"
+       height="16"
+       layout="topleft"
+       name="env_materials_m"
+       left_pad="0"
+       top_delta="0"
+       width="100" />
+      <check_box
+       enabled_control="MaterialsNextOwnerCopy"
+       control_name="MaterialsNextOwnerTransfer"
+       height="16"
+       layout="topleft"
+       name="env_materials_t"
+       left_pad="0"
+       top_delta="0"
+       width="100" />
+      <check_box
+       control_name="MaterialsShareWithGroup"
+       height="16"
+       layout="topleft"
+       name="env_materials_s"
+       left_pad="0"
+       top_delta="0"
+       width="120" />
+      <check_box
+       control_name="MaterialsEveryoneCopy"
+       height="16"
+       layout="topleft"
+       name="env_materials_e"
+       left_pad="0"
+       top_delta="0"
+       width="100" />
   </panel>
   <button
    height="20"
-- 
cgit v1.2.3


From a27e701530e3498f71b828d7639024330cd0ccb7 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 17 Oct 2022 23:33:27 +0300
Subject: SL-18008 Add Save and Edit buttons to right click menu for materials

---
 indra/newview/skins/default/xui/en/menu_object.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index ce34508303..6d37c15815 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -21,6 +21,22 @@
     <menu_item_call.on_enable
         function="EnableEdit"/>
   </menu_item_call>
+  <menu_item_call
+      label="Edit PBR Material"
+      name="EditGLTFMaterial">
+    <menu_item_call.on_click
+        function="Object.EditGLTFMaterial" />
+    <menu_item_call.on_enable
+        function="Object.EnableEditGLTFMaterial"/>
+  </menu_item_call>
+  <menu_item_call
+      label="Save material to inventory"
+      name="SaveGLTFMaterial">
+    <menu_item_call.on_click
+        function="Object.SaveGLTFMaterial" />
+    <menu_item_call.on_enable
+        function="Object.EnableSaveGLTFMaterial"/>
+  </menu_item_call>
   <menu_item_call
       label="Build"
       name="Build">
-- 
cgit v1.2.3


From 77eba62335158db6b0c6c7966a26b956fd796da9 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 17 Oct 2022 23:55:59 +0300
Subject: SL-18008 Placeholder functionality for PBR Edit button

---
 indra/newview/skins/default/xui/en/floater_material_editor.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml
index 3314d49ac3..434123faf0 100644
--- a/indra/newview/skins/default/xui/en/floater_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -15,6 +15,7 @@
   <string name="upload_fee_string">L$[FEE] upload fee</string>
   <string name="material_selection_title">Material selection</string>
   <string name="material_selection_text">Select material:</string>
+  <string name="material_override_title">Material override</string>
 
   <scroll_container
    name="materials_scroll"
-- 
cgit v1.2.3


From 687a012a695bb7da55fc2b9b220f48de658cb8b6 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 25 Oct 2022 19:55:59 +0300
Subject: SL-18008 Add "Save/Edit Materials" buttons to attachment's right
 click menu

---
 .../skins/default/xui/en/menu_attachment_self.xml        | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
index 3b91b9df7a..630a1981df 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -12,6 +12,22 @@
         <menu_item_call.on_enable
          function="EnableEdit" />
     </menu_item_call>
+    <menu_item_call
+     label="Edit PBR Material"
+     name="EditGLTFMaterial">
+        <menu_item_call.on_click
+         function="Object.EditGLTFMaterial" />
+        <menu_item_call.on_enable
+         function="Object.EnableEditGLTFMaterial"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Save material to inventory"
+     name="SaveGLTFMaterial">
+        <menu_item_call.on_click
+         function="Object.SaveGLTFMaterial" />
+        <menu_item_call.on_enable
+         function="Object.EnableSaveGLTFMaterial"/>
+    </menu_item_call>
     <menu_item_call
      enabled="false"
      label="Detach item"
-- 
cgit v1.2.3


From 6860df0b981a0fa656bc21c98137dd2395578670 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 27 Oct 2022 20:46:51 +0300
Subject: SL-17699 Enable 'none' button it amterial picker

---
 indra/newview/skins/default/xui/en/panel_tools_texture.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 104bcb9257..ff2323784c 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -252,6 +252,7 @@
              width="64" />
             <texture_picker
              can_apply_immediately="true"
+             allow_no_texture="true"
              follows="left|top"
              height="80"
              label="PBR       "
-- 
cgit v1.2.3


From 29062fd90763d6865db514cfc6c012c08f9621e5 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 27 Oct 2022 23:06:12 +0300
Subject: SL-18441 "Override" UI cleanup

---
 indra/newview/skins/default/xui/en/floater_material_editor.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml
index 434123faf0..84264cd2e6 100644
--- a/indra/newview/skins/default/xui/en/floater_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -15,7 +15,7 @@
   <string name="upload_fee_string">L$[FEE] upload fee</string>
   <string name="material_selection_title">Material selection</string>
   <string name="material_selection_text">Select material:</string>
-  <string name="material_override_title">Material override</string>
+  <string name="material_override_title">Editing Material</string>
 
   <scroll_container
    name="materials_scroll"
@@ -475,7 +475,7 @@
                left="10"
                top="0"
            >
-      Usaved changes
+      Unsaved changes
     </text>
     <button
                follows="left|top"
-- 
cgit v1.2.3


From c61224bef22686c4e6f5b4a6af9acbeb27d561ab Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 29 Oct 2022 00:27:47 +0300
Subject: SL-17699 Hide pipette for material picker

At the moment there is no specification how it should work, it can't work like it does for textures due to material overrides.
Also removed some dead code
---
 indra/newview/skins/default/xui/en/floater_texture_ctrl.xml | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index 0cb69137e3..18631c3ae7 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -275,19 +275,6 @@
          name="BAKED_AUX3"
          value="10" />
   </combo_box>
-  <check_box
-     follows="left|top"
-     height="20"
-     initial_value="false"
-     label="Hide Base Mesh Region"
-     
-layout="topleft"
-     name="hide_base_mesh_region"
-     left_delta="0"
-     top_pad="10"
-     top_delta="0"
-     width="120" 
-     visible="false"/>
 <!-- bottom static -->
     <button
      follows="bottom"
-- 
cgit v1.2.3


From b6a35e36d71b421e8f74e5b5e3f0909c8fcda930 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 29 Oct 2022 01:27:35 +0300
Subject: SL-18448 Material Editor and Tools floater adjustments

1. Enable glow
2. Added buttons to texture->pbr
---
 .../skins/default/xui/en/panel_tools_texture.xml   | 38 ++++++++++++++++------
 1 file changed, 28 insertions(+), 10 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index ff2323784c..e2d571324f 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -239,28 +239,46 @@
              width="160" />
             <texture_picker
              can_apply_immediately="true"
-             default_image_name="Default"
-             fallback_image="materials_ui_x_24.png"
+             allow_no_texture="true"
              follows="left|top"
              height="80"
-             label="Texture       "
+             label="PBR       "
              layout="topleft"
              left="10"
-             name="texture control"
-             tool_tip="Click to choose a picture"
+             name="pbr_control"
+             tool_tip="Click to choose a pbr material"
              top_pad="5"
              width="64" />
+            <button
+             follows="left|top"
+             height="23"
+             layout="topleft"
+             left_pad="10"
+             top_delta="0"
+             name="pbr_from_inventory"
+             label="Choose from inventory"
+             width="140"/>
+            <button
+             follows="left|top"
+             height="23"
+             layout="topleft"
+             left_delta="0"
+             top_pad="4"
+             name="edit_selected_pbr"
+             label="Edit Selected"
+             width="140"/>
             <texture_picker
              can_apply_immediately="true"
-             allow_no_texture="true"
+             default_image_name="Default"
+             fallback_image="materials_ui_x_24.png"
              follows="left|top"
              height="80"
-             label="PBR       "
+             label="Texture       "
              layout="topleft"
              left="10"
-             name="pbr_control"
-             tool_tip="Click to choose a pbr material"
-             top_delta="0"
+             name="texture control"
+             tool_tip="Click to choose a picture"
+             top_delta="-27"
              width="64" />
             <text
              type="string"
-- 
cgit v1.2.3


From 8c5c07d30749f2abeb475c37b81f9cf089721a1e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 1 Nov 2022 22:01:45 +0200
Subject: SL-18448 Modified Material Editor to match overrides better

---
 .../xui/en/floater_live_material_editor.xml        |  37 ++
 .../default/xui/en/floater_material_editor.xml     | 433 +--------------------
 .../skins/default/xui/en/panel_gltf_material.xml   | 382 ++++++++++++++++++
 3 files changed, 429 insertions(+), 423 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_live_material_editor.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_gltf_material.xml

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_live_material_editor.xml b/indra/newview/skins/default/xui/en/floater_live_material_editor.xml
new file mode 100644
index 0000000000..317783f794
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_live_material_editor.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="true"
+ default_tab_group="1"
+ height="786"
+ width="256"
+ min_height="500"
+ min_width="256"
+ layout="topleft"
+ name="material editor"
+ help_topic="material_editor"
+ single_instance="true"
+ title="Editing Material">
+  <scroll_container
+   name="materials_scroll"
+   top="14"
+   left="4"
+   height="768"
+   width="247"
+   follows="all"
+   layout="topleft"
+   color="DkGray2"
+   opaque="true"
+   reserve_scroll_corner="false">
+    <panel
+     name="panel_material"
+     filename="panel_gltf_material.xml"
+     border="false"
+     visible="true"
+     layout="topleft"
+     top="0"
+     left="0"
+     height="768"
+     width="247" />
+  </scroll_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml
index 84264cd2e6..29def9bd53 100644
--- a/indra/newview/skins/default/xui/en/floater_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -27,430 +27,17 @@
    layout="topleft"
    color="DkGray2"
    opaque="true"
-   reserve_scroll_corner="false"
-      >
+   reserve_scroll_corner="false">
     <panel
-      border="false"
-      name="scroll_panel"
-      top="0"
-      left="0"
-      height="768"
-      width="247"
-        >
-      <check_box
-              follows="left|top"
-              label="Double Sided"
-              left="10"
-              top="0"
-              name="double sided"
-              height="25"
-              width="120" />
-      <panel
-        border="true"
-             follows="left|top"
-             width="246"
-             height="196"
-             layout="topleft"
-             left="1"
-             mouse_opaque="false"
-             name="base_color_texture_pnl"
-             top_pad="5"
-         >
-        <text
-                   type="string"
-                   font.style="BOLD"
-                   length="1"
-                   follows="left|top"
-                   height="10"
-                   layout="topleft"
-                   left="10"
-                   top="5"
-                   width="128">
-          Base Color:
-        </text>
-        <texture_picker
-                 can_apply_immediately="true"
-                 default_image_name="Default"
-                 fallback_image="materials_ui_x_24.png"
-                 allow_no_texture="true"
-                 follows="left|top"
-                 top_pad="8"
-                 height="151"
-                 layout="topleft"
-                 left="10"
-                 name="base_color_texture"
-                 tool_tip="Base Color map.  Alpha channel is optional and used for transparency."
-                 width="128" />
-        <text
-                   type="string"
-                   font.style="BOLD"
-                   length="1"
-                   follows="left|top"
-                   height="10"
-                   width="128"
-                   layout="topleft"
-                   left="10"
-                   top_pad="-17"
-                   name="base_color_upload_fee"
-             >
-          No upload fee
-        </text>
-        <text
-                   type="string"
-                   length="1"
-                   follows="left|top"
-                   height="10"
-                   layout="topleft"
-                   left_pad="5"
-                   top="8"
-             >
-          Tint
-        </text>
-        <color_swatch
-                          can_apply_immediately="true"
-                          follows="left|top"
-                          height="40"
-                          label_height="0"
-                          layout="topleft"
-                          left_delta="0"
-                          top_pad="5"
-                          name="base color"
-                          width="40" />
-        <text
-                 type="string"
-                 length="1"
-                 follows="left|top"
-                 height="10"
-                 layout="topleft"
-                 left_delta="0"
-                 top_pad="5"
-                 width="96"
-             >
-          Transparency
-        </text>
-        <spinner
-                   decimal_digits="3"
-                   follows="left|top"
-                   height="19"
-                   increment="0.01"
-                   initial_value="1"
-                   layout="topleft"
-                   left_delta="0"
-                   top_pad="5"
-                   min_val="0"
-                   max_val="1"
-                   name="transparency"
-                  width="64"
-             />
-        <text
-                 type="string"
-                 length="1"
-                 follows="left|top"
-                 height="10"
-                 layout="topleft"
-                 left_delta="0"
-                 name="label alphamode"
-                 text_readonly_color="LabelDisabledColor"
-                 top_pad="5"
-                 width="90">
-          Alpha mode
-        </text>
-        <combo_box
-         height="23"
-         layout="topleft"
-         left_delta="0"
-         name="alpha mode"
-         top_pad="4"
-         width="96">
-          <combo_box.item
-           label="None"
-           name="None"
-           value="OPAQUE" />
-          <combo_box.item
-           label="Alpha blending"
-           name="Alpha blending"
-           value="BLEND" />
-          <combo_box.item
-           label="Alpha masking"
-           name="Alpha masking"
-           value="MASK" />
-        </combo_box>
-        <text
-                 type="string"
-                 length="1"
-                 follows="left|top"
-                 height="10"
-                 layout="topleft"
-                 left_delta="0"
-                 top_pad="5"
-                 width="96"
-             >
-          Alpha Cutoff
-        </text>
-        <spinner
-                   decimal_digits="3"
-                   follows="left|top"
-                   height="19"
-                   increment="0.01"
-                   initial_value="1"
-                   layout="topleft"
-                   left_delta="0"
-                   top_pad="5"
-                   min_val="0"
-                   max_val="1"
-                   name="alpha cutoff"
-                  width="64"
-             />
-      </panel>
-      <panel
-        border="true"
-             follows="left|top"
-             width="246"
-             height="175"
-             layout="topleft"
-             left="1"
-             mouse_opaque="false"
-             name="metallic_texture_pnl"
-             top_pad="5"
-         >
-        <text
-                 type="string"
-                 font.style="BOLD"
-                 length="1"
-                 follows="left|top"
-                 height="10"
-                 layout="topleft"
-                 left="10"
-                 top="5"
-             >
-          Metallic-Roughness:
-        </text>
-        <texture_picker
-                 can_apply_immediately="true"
-                 default_image_name="Default"
-                 fallback_image="materials_ui_x_24.png"
-                 allow_no_texture="true"
-                 follows="left|top"
-                 width="128"
-                 height="151"
-                 layout="topleft"
-                 left="10"
-                 name="metallic_roughness_texture"
-                 tool_tip="GLTF metallic-roughness map with optional occlusion.  Red channel is occlusion, green channel is roughness, blue channel is metalness."
-                 top_pad="8"
-             />
-        <text
-                   type="string"
-                   font.style="BOLD"
-                   length="1"
-                   follows="left|top"
-                   height="10"
-                   width="128"
-                   layout="topleft"
-                   left="10"
-                   top_pad="-17"
-                   name="metallic_upload_fee"
-           >
-          No upload fee
-        </text>
-        <text
-                   type="string"
-                   length="1"
-                   follows="left|top"
-                   height="10"
-                   layout="topleft"
-                   left_pad="5"
-                   top="8"
-             >
-          Metallic Factor
-        </text>
-        <spinner
-                   decimal_digits="3"
-                   follows="left|top"
-                   height="19"
-                   increment="0.01"
-                   initial_value="0"
-                   layout="topleft"
-                   left_delta="0"
-                   top_pad="5"
-                   min_val="0"
-                   max_val="1"
-                   name="metalness factor"
-                  width="64"
-             />
-        <text
-                 type="string"
-                 length="1"
-                 follows="left|top"
-                 height="10"
-                 layout="topleft"
-                 left_delta="0"
-                 top_pad="5"
-                 width="96"
-             >
-          Roughness Factor
-        </text>
-        <spinner
-                   decimal_digits="3"
-                   follows="left|top"
-                   height="19"
-                   increment="0.01"
-                   initial_value="0"
-                   layout="topleft"
-                   left_delta="0"
-                   top_pad="5"
-                   min_val="0"
-                   max_val="1"
-                   name="roughness factor"
-                  width="64"
-             />
-      </panel>
-      <panel
-        border="true"
-             follows="left|top"
-             width="246"
-             height="175"
-             layout="topleft"
-             left="1"
-             mouse_opaque="false"
-             name="emissive_texture_pnl"
-             top_pad="5"
-         >
-        <text
-                   type="string"
-                   font.style="BOLD"
-                   length="1"
-                   follows="left|top"
-                   height="10"
-                   layout="topleft"
-                   left="10"
-                   top="5"
-                   width="64">
-          Emissive:
-        </text>
-        <texture_picker
-                   can_apply_immediately="true"
-                   default_image_name="Default"
-                   fallback_image="materials_ui_x_24.png"
-                   allow_no_texture="true"
-                   follows="left|top"
-                   top_pad="8"
-                   height="151"
-                   layout="topleft"
-                   left="10"
-                   name="emissive_texture"
-                   width="128" />
-        <text
-                   type="string"
-                   font.style="BOLD"
-                   length="1"
-                   follows="left|top"
-                   height="10"
-                   width="128"
-                   layout="topleft"
-                   left="10"
-                   top_pad="-17"
-                   name="emissive_upload_fee"
-           >
-          No upload fee
-        </text>
-        <text
-                   type="string"
-                   length="1"
-                   follows="left|top"
-                   height="10"
-                   layout="topleft"
-                   left_pad="5"
-                   top="8"
-             >
-          Tint
-        </text>
-        <color_swatch
-                          can_apply_immediately="true"
-                          follows="left|top"
-                          height="40"
-                          label_height="0"
-                          layout="topleft"
-                          left_delta="0"
-                          top_pad="5"
-                          name="emissive color"
-                          width="40" />
-        <!--<text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             width="64"
-             layout="topleft"
-             left_delta="0"
-             top_pad="5"
-             >
-      Intensity
-    </text>
-    <spinner
-               decimal_digits="3"
-               follows="left|top"
-               height="19"
-               increment="0.01"
-               initial_value="0"
-               layout="topleft"
-               left_delta="0"
-               top_pad="5"
-               max_val="100"
-              width="64"
-             />-->
-      </panel>
-      <panel
-        border="true"
-             follows="left|top"
-             width="246"
-             height="175"
-             layout="topleft"
-             left="1"
-             mouse_opaque="false"
-             top_pad="5"
-             name="normal_texture_pnl"
-         >
-        <text
-                   type="string"
-                   font.style="BOLD"
-                   length="1"
-                   follows="left|top"
-                   height="10"
-                   layout="topleft"
-                   left="10"
-                   top="5"
-                   width="64">
-          Normal:
-        </text>
-        <texture_picker
-                   can_apply_immediately="true"
-                   default_image_name="Default"
-                   fallback_image="materials_ui_x_24.png"
-                   allow_no_texture="true"
-                   follows="left|top"
-                   top_pad="8"
-                   height="151"
-                   layout="topleft"
-                   left="10"
-                   name="normal_texture"
-                   width="128" />
-        <text
-                   type="string"
-                   font.style="BOLD"
-                   length="1"
-                   follows="left|top"
-                   height="10"
-                   width="128"
-                   layout="topleft"
-                   left="10"
-                   top_pad="-17"
-                   name="normal_upload_fee"
-           >
-          No upload fee
-        </text>
-      </panel>
-    </panel>
+     name="panel_material"
+     filename="panel_gltf_material.xml"
+     border="false"
+     visible="true"
+     layout="topleft"
+     top="0"
+     left="0"
+     height="768"
+     width="247" />
   </scroll_container>
 
   <panel
diff --git a/indra/newview/skins/default/xui/en/panel_gltf_material.xml b/indra/newview/skins/default/xui/en/panel_gltf_material.xml
new file mode 100644
index 0000000000..61cb6d8a8f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_gltf_material.xml
@@ -0,0 +1,382 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ layout="topleft"
+ follows="all"
+ border="false"
+ name="panel_gltf_material"
+ top="0"
+ left="0"
+ height="768"
+ width="247">
+  <check_box
+    follows="left|top"
+    layout="topleft"
+    label="Double Sided"
+    left="10"
+    top="0"
+    name="double sided"
+    height="25"
+    width="120" />
+  <panel
+    border="true"
+    follows="left|top"
+    width="246"
+    height="196"
+    layout="topleft"
+    left="1"
+    mouse_opaque="false"
+    name="base_color_texture_pnl"
+    top_pad="5"
+         >
+    <text
+      type="string"
+      font.style="BOLD"
+      length="1"
+      follows="left|top"
+      height="10"
+      layout="topleft"
+      left="10"
+      top="5"
+      width="128">
+      Base Color:
+    </text>
+    <texture_picker
+      can_apply_immediately="true"
+      default_image_name="Default"
+      fallback_image="materials_ui_x_24.png"
+      allow_no_texture="true"
+      follows="left|top"
+      top_pad="8"
+      height="151"
+      layout="topleft"
+      left="10"
+      name="base_color_texture"
+      tool_tip="Base Color map.  Alpha channel is optional and used for transparency."
+      width="128" />
+    <text
+      type="string"
+      font.style="BOLD"
+      length="1"
+      follows="left|top"
+      height="10"
+      width="128"
+      layout="topleft"
+      left="10"
+      top_pad="-17"
+      name="base_color_upload_fee">
+      No upload fee
+    </text>
+    <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="10"
+      layout="topleft"
+      left_pad="5"
+      top="8">
+      Tint
+    </text>
+    <color_swatch
+      can_apply_immediately="true"
+      follows="left|top"
+      height="40"
+      label_height="0"
+      layout="topleft"
+      left_delta="0"
+      top_pad="5"
+      name="base color"
+      width="40" />
+    <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="10"
+      layout="topleft"
+      left_delta="0"
+      top_pad="5"
+      width="96">
+      Transparency
+    </text>
+    <spinner
+      decimal_digits="3"
+      follows="left|top"
+      height="19"
+      increment="0.01"
+      initial_value="1"
+      layout="topleft"
+      left_delta="0"
+      top_pad="5"
+      min_val="0"
+      max_val="1"
+      name="transparency"
+      width="64"/>
+    <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="10"
+      layout="topleft"
+      left_delta="0"
+      name="label alphamode"
+      text_readonly_color="LabelDisabledColor"
+      top_pad="5"
+      width="90">
+      Alpha mode
+    </text>
+    <combo_box
+     height="23"
+     layout="topleft"
+     left_delta="0"
+     name="alpha mode"
+     top_pad="4"
+     width="96">
+      <combo_box.item
+       label="None"
+       name="None"
+       value="OPAQUE" />
+      <combo_box.item
+       label="Alpha blending"
+       name="Alpha blending"
+       value="BLEND" />
+      <combo_box.item
+       label="Alpha masking"
+       name="Alpha masking"
+       value="MASK" />
+    </combo_box>
+    <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="10"
+      layout="topleft"
+      left_delta="0"
+      top_pad="5"
+      width="96">
+      Alpha Cutoff
+    </text>
+    <spinner
+      decimal_digits="3"
+      follows="left|top"
+      height="19"
+      increment="0.01"
+      initial_value="1"
+      layout="topleft"
+      left_delta="0"
+      top_pad="5"
+      min_val="0"
+      max_val="1"
+      name="alpha cutoff"
+      width="64"/>
+  </panel>
+  <panel
+    border="true"
+    follows="left|top"
+    width="246"
+    height="175"
+    layout="topleft"
+    left="1"
+    mouse_opaque="false"
+    name="metallic_texture_pnl"
+    top_pad="5">
+    <text
+      type="string"
+      font.style="BOLD"
+      length="1"
+      follows="left|top"
+      height="10"
+      layout="topleft"
+      left="10"
+      top="5">
+      Metallic-Roughness:
+    </text>
+    <texture_picker
+      can_apply_immediately="true"
+      default_image_name="Default"
+      fallback_image="materials_ui_x_24.png"
+      allow_no_texture="true"
+      follows="left|top"
+      width="128"
+      height="151"
+      layout="topleft"
+      left="10"
+      name="metallic_roughness_texture"
+      tool_tip="GLTF metallic-roughness map with optional occlusion.  Red channel is occlusion, green channel is roughness, blue channel is metalness."
+      top_pad="8"/>
+    <text
+      type="string"
+      font.style="BOLD"
+      length="1"
+      follows="left|top"
+      height="10"
+      width="128"
+      layout="topleft"
+      left="10"
+      top_pad="-17"
+      name="metallic_upload_fee">
+      No upload fee
+    </text>
+    <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="10"
+      layout="topleft"
+      left_pad="5"
+      top="8">
+      Metallic Factor
+    </text>
+    <spinner
+      decimal_digits="3"
+      follows="left|top"
+      height="19"
+      increment="0.01"
+      initial_value="0"
+      layout="topleft"
+      left_delta="0"
+      top_pad="5"
+      min_val="0"
+      max_val="1"
+      name="metalness factor"
+      width="64"/>
+    <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="10"
+      layout="topleft"
+      left_delta="0"
+      top_pad="5"
+      width="96">
+      Roughness Factor
+    </text>
+    <spinner
+      decimal_digits="3"
+      follows="left|top"
+      height="19"
+      increment="0.01"
+      initial_value="0"
+      layout="topleft"
+      left_delta="0"
+      top_pad="5"
+      min_val="0"
+      max_val="1"
+      name="roughness factor"
+      width="64"/>
+  </panel>
+  <panel
+    border="true"
+    follows="left|top"
+    width="246"
+    height="175"
+    layout="topleft"
+    left="1"
+    mouse_opaque="false"
+    name="emissive_texture_pnl"
+    top_pad="5">
+    <text
+      type="string"
+      font.style="BOLD"
+      length="1"
+      follows="left|top"
+      height="10"
+      layout="topleft"
+      left="10"
+      top="5"
+      width="64">
+      Emissive:
+    </text>
+    <texture_picker
+      can_apply_immediately="true"
+      default_image_name="Default"
+      fallback_image="materials_ui_x_24.png"
+      allow_no_texture="true"
+      follows="left|top"
+      top_pad="8"
+      height="151"
+      layout="topleft"
+      left="10"
+      name="emissive_texture"
+      width="128" />
+    <text
+      type="string"
+      font.style="BOLD"
+      length="1"
+      follows="left|top"
+      height="10"
+      width="128"
+      layout="topleft"
+      left="10"
+      top_pad="-17"
+      name="emissive_upload_fee">
+      No upload fee
+    </text>
+    <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="10"
+      layout="topleft"
+      left_pad="5"
+      top="8">
+      Tint
+    </text>
+    <color_swatch
+     can_apply_immediately="true"
+     follows="left|top"
+     height="40"
+     label_height="0"
+     layout="topleft"
+     left_delta="0"
+     top_pad="5"
+     name="emissive color"
+     width="40" />
+  </panel>
+  <panel
+    border="true"
+    follows="left|top"
+    width="246"
+    height="175"
+    layout="topleft"
+    left="1"
+    mouse_opaque="false"
+    top_pad="5"
+    name="normal_texture_pnl">
+    <text
+      type="string"
+      font.style="BOLD"
+      length="1"
+      follows="left|top"
+      height="10"
+      layout="topleft"
+      left="10"
+      top="5"
+      width="64">
+      Normal:
+    </text>
+    <texture_picker
+      can_apply_immediately="true"
+      default_image_name="Default"
+      fallback_image="materials_ui_x_24.png"
+      allow_no_texture="true"
+      follows="left|top"
+      top_pad="8"
+      height="151"
+      layout="topleft"
+      left="10"
+      name="normal_texture"
+      width="128" />
+    <text
+      type="string"
+      font.style="BOLD"
+      length="1"
+      follows="left|top"
+      height="10"
+      width="128"
+      layout="topleft"
+      left="10"
+      top_pad="-17"
+      name="normal_upload_fee">
+      No upload fee
+    </text>
+  </panel>
+</panel>
-- 
cgit v1.2.3


From 734e3fcb21228d07038da952820fa371e3c8af14 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 2 Nov 2022 01:07:37 +0200
Subject: SL-18522 Use naming consistent with GLTF standard

---
 indra/newview/skins/default/xui/en/panel_gltf_material.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_gltf_material.xml b/indra/newview/skins/default/xui/en/panel_gltf_material.xml
index 61cb6d8a8f..f4060648b9 100644
--- a/indra/newview/skins/default/xui/en/panel_gltf_material.xml
+++ b/indra/newview/skins/default/xui/en/panel_gltf_material.xml
@@ -131,15 +131,15 @@
      top_pad="4"
      width="96">
       <combo_box.item
-       label="None"
+       label="Opaque"
        name="None"
        value="OPAQUE" />
       <combo_box.item
-       label="Alpha blending"
+       label="Blend"
        name="Alpha blending"
        value="BLEND" />
       <combo_box.item
-       label="Alpha masking"
+       label="Mask"
        name="Alpha masking"
        value="MASK" />
     </combo_box>
-- 
cgit v1.2.3


From d042ad67ed4db72bf0265804e26610e565f15cf2 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 2 Nov 2022 19:46:13 +0200
Subject: SL-18448 Make material editor's scroll smarter

---
 .../skins/default/xui/en/floater_live_material_editor.xml   | 12 ++++++------
 .../skins/default/xui/en/floater_material_editor.xml        | 13 +++++++------
 indra/newview/skins/default/xui/en/panel_gltf_material.xml  |  4 ++--
 3 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_live_material_editor.xml b/indra/newview/skins/default/xui/en/floater_live_material_editor.xml
index 317783f794..7759bc2399 100644
--- a/indra/newview/skins/default/xui/en/floater_live_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_live_material_editor.xml
@@ -3,7 +3,7 @@
  legacy_header_height="18"
  can_resize="true"
  default_tab_group="1"
- height="786"
+ height="790"
  width="256"
  min_height="500"
  min_width="256"
@@ -14,10 +14,10 @@
  title="Editing Material">
   <scroll_container
    name="materials_scroll"
-   top="14"
+   top="18"
    left="4"
    height="768"
-   width="247"
+   width="250"
    follows="all"
    layout="topleft"
    color="DkGray2"
@@ -26,12 +26,12 @@
     <panel
      name="panel_material"
      filename="panel_gltf_material.xml"
-     border="false"
-     visible="true"
      layout="topleft"
+     follows="left|top|right"
+     border="false"
      top="0"
      left="0"
      height="768"
-     width="247" />
+     width="236" />
   </scroll_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml
index 29def9bd53..1a53d7832d 100644
--- a/indra/newview/skins/default/xui/en/floater_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -3,7 +3,7 @@
  legacy_header_height="18"
  can_resize="true"
  default_tab_group="1"
- height="887"
+ height="891"
  width="256"
  min_height="500"
  min_width="256"
@@ -19,25 +19,26 @@
 
   <scroll_container
    name="materials_scroll"
-   top="14"
+   top="18"
    left="4"
    height="768"
-   width="247"
+   width="250"
    follows="all"
    layout="topleft"
    color="DkGray2"
    opaque="true"
+   border="false"
    reserve_scroll_corner="false">
     <panel
      name="panel_material"
      filename="panel_gltf_material.xml"
-     border="false"
-     visible="true"
      layout="topleft"
+     follows="left|top|right"
+     border="false"
      top="0"
      left="0"
      height="768"
-     width="247" />
+     width="236" />
   </scroll_container>
 
   <panel
diff --git a/indra/newview/skins/default/xui/en/panel_gltf_material.xml b/indra/newview/skins/default/xui/en/panel_gltf_material.xml
index f4060648b9..2936b3cb63 100644
--- a/indra/newview/skins/default/xui/en/panel_gltf_material.xml
+++ b/indra/newview/skins/default/xui/en/panel_gltf_material.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  layout="topleft"
- follows="all"
+ follows="left|top|right"
  border="false"
  name="panel_gltf_material"
  top="0"
@@ -129,7 +129,7 @@
      left_delta="0"
      name="alpha mode"
      top_pad="4"
-     width="96">
+     width="89">
       <combo_box.item
        label="Opaque"
        name="None"
-- 
cgit v1.2.3


From a87505333e0fcd5ba06da76d0d66e469121e8b30 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 2 Nov 2022 23:39:55 +0200
Subject: SL-18448 Save material button in tools floater

---
 indra/newview/skins/default/xui/en/panel_tools_texture.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index e2d571324f..da74b65848 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -267,6 +267,15 @@
              name="edit_selected_pbr"
              label="Edit Selected"
              width="140"/>
+            <button
+             follows="left|top"
+             height="23"
+             layout="topleft"
+             left_delta="0"
+             top_pad="4"
+             name="save_selected_pbr"
+             label="Save to inventory"
+             width="140"/>
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -278,7 +287,7 @@
              left="10"
              name="texture control"
              tool_tip="Click to choose a picture"
-             top_delta="-27"
+             top_delta="-54"
              width="64" />
             <text
              type="string"
-- 
cgit v1.2.3


From a0c7a7ecdc7b9fb53fa1175babf0d8497a3e9112 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 3 Nov 2022 13:18:14 +0200
Subject: SL-18548 fix for crash when trying to Save material without caps

---
 indra/newview/skins/default/xui/en/notifications.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 07ad2838b0..1dc979fda6 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6856,6 +6856,14 @@ Please try again.
     <tag>fail</tag>
   </notification>
 
+  <notification
+   icon="notifytip.tga"
+   name="MissingMaterialCaps"
+   type="notifytip">
+    <tag>fail</tag>
+    Not connected to a materials capable region.
+  </notification>
+
   <notification
    icon="notifytip.tga"
    name="ScriptMissing"
-- 
cgit v1.2.3


From d72824c2b789b81b2bc0ae2c20012ca45d23a42d Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 8 Nov 2022 21:14:22 +0200
Subject: SL-18197 Bump inventory cache version

Issue: release viewer saves materials as AT_UNKNOWN (255). When material viewer loads cache with materials saved as '255' instead of '57', material viewer doesn't know to update content and it casuses issues. Viewer eventally recovers, but it's simpler to drop cache in this case over trying to figure out if our unknown is a material (but may be cache should include asset type count to let viewer know when to double check unknowns).
Also made 'legacy' materials folder's name localizable just in case.
---
 indra/newview/skins/default/xui/en/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 9f183d137d..e7e1a24f5e 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2474,6 +2474,7 @@ If you continue to receive this message, please contact Second Life support for
 	<string name="InvFolder Received Items">Received Items</string>
 	<string name="InvFolder Merchant Outbox">Merchant Outbox</string>
   <string name="InvFolder Settings">Settings</string>
+  <string name="InvFolder Material">Materials</string>
   <string name="InvFolder Materials">Materials</string>
 
   <!-- are used for Friends and Friends/All folders in Inventory "Calling cards" folder. See EXT-694-->
-- 
cgit v1.2.3


From eab3d43e1b2283ba07037cec7ccce78dc4022f1d Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Thu, 10 Nov 2022 14:20:51 -0800
Subject: SL-18627: Make space for pbr transform controls in build floater and
 disable some WIP controls

---
 .../skins/default/xui/en/panel_tools_texture.xml   | 91 +++++++++++++++++++---
 1 file changed, 79 insertions(+), 12 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index da74b65848..91cd28d80a 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -153,7 +153,7 @@
                  value="Media" />
             </combo_box>
             <radio_group
-            height="50"
+            height="84"
             layout="topleft"
             left_pad="5"
             top_delta="-10"
@@ -183,7 +183,7 @@
                 value="2"/>
             </radio_group>
             <radio_group
-            height="50"
+            height="84"
             layout="topleft"
             left_delta="0"
             top_delta="0"
@@ -191,26 +191,40 @@
             visible = "false"
             name="radio_pbr_type">
                 <radio_item
-                label="Color/emissive"
-                name="Color/emissive"
-                top="0" 
+                label="Complete material"
+                name="Complete material"
+                top="0"
                 layout="topleft"
-                height="16" 
+                height="16"
                 value="0"/>
                 <radio_item
+                label="Base color"
+                name="Base color"
+                layout="topleft"
+                top_pad="1" 
+                height="16" 
+                value="1"/>
+                <radio_item
                 label="Normal"
                 layout="topleft"
                 top_pad="1" 
                 height="16" 
                 name="Normal"
-                value="1"/>
+                value="2"/>
                 <radio_item
                 label="Metallic/roughness"
                 name="Metallic/roughness"
                 height="16"
                 layout="topleft"
                 top_pad="1"
-                value="2"/>
+                value="3"/>
+                <radio_item
+                label="Emissive"
+                name="Emissive"
+                layout="topleft"
+                top_pad="1" 
+                height="16" 
+                value="4"/>
             </radio_group>
             <menu_button
                 menu_filename="menu_copy_paste_texture.xml"
@@ -228,7 +242,7 @@
             <check_box
              control_name="SyncMaterialSettings"
              follows="top|left"
-             height="20"
+             height="47"
              initial_value="false"
              label="Lock repeat"
              layout="topleft"
@@ -877,6 +891,59 @@
              max_val="1"
              name="shinyOffsetV"
              width="265" />
+            <!-- BEGIN PBR Material texture transform parameters -->
+            <spinner
+             follows="left|top"
+             height="19"
+             initial_value="1"
+             label="ScaleU"
+             label_width="205"
+             layout="topleft"
+             left="10"
+             name="gltfTextureScaleU"
+             top_delta="-115"
+             width="265" />
+            <spinner
+             follows="left|top"
+             height="19"
+             initial_value="1"
+             label="ScaleV"
+             label_width="205"
+             layout="topleft"
+             left="10"
+             name="gltfTextureScaleV"
+             width="265" />
+            <spinner
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             label="Rotation"
+             label_width="205"
+             layout="topleft"
+             left="10"
+             name="gltfTextureRotation"
+             width="265" />
+            <spinner
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             label="TranslationU"
+             label_width="205"
+             layout="topleft"
+             left="10"
+             name="gltfTextureTranslationU"
+             width="265" />
+            <spinner
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             label="TranslationV"
+             label_width="205"
+             layout="topleft"
+             left="10"
+             name="gltfTextureTranslationV"
+             width="265" />
+            <!-- END PBR Material texture transform parameters -->
             <check_box
              follows="top|left"
              height="16"
@@ -889,10 +956,10 @@
              top_delta="16"
              width="260" />
 			<button
-       follows="left|top"
-       layout="topleft"
+             follows="left|top"
+             layout="topleft"
 			 left="9"
-			 top="204"
+			 top="231"
 			 height="20"
 			 label="Align"
 			 label_selected="Align current texture layers"
-- 
cgit v1.2.3


From cdf248d9860246fd0bee84f700642709fdebbe6e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 11 Nov 2022 22:45:42 +0200
Subject: SL-18391 Basic gltf material accounting

Plan is to expand it as needed with overrides, request rate and memory
---
 indra/newview/skins/default/xui/en/floater_stats.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index b9ca0108b6..9ee161e611 100644
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -133,6 +133,12 @@
                     label="Bound Mem"
                     stat="glboundmemstat"/>
         </stat_view>
+       <stat_view name="material"
+                  label="Material">
+         <stat_bar name="nummaterials"
+                   label="Count"
+                   stat="nummaterials"/>
+       </stat_view>
 			 <stat_view name="memory"
 									label="Memory Usage">
 				 <stat_bar name="LLTrace"
-- 
cgit v1.2.3


From fd76c195c83d4af7469cc41f59c3fdcb02716012 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Fri, 11 Nov 2022 15:53:45 -0800
Subject: SL-18632: Implement editing GLTF material texture transforms in build
 floater

---
 .../skins/default/xui/en/panel_tools_texture.xml   | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 91cd28d80a..06e2a6e98e 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -896,10 +896,12 @@
              follows="left|top"
              height="19"
              initial_value="1"
-             label="ScaleU"
+             label="Scale u"
              label_width="205"
              layout="topleft"
              left="10"
+             min_val="-100"
+             max_val="100"
              name="gltfTextureScaleU"
              top_delta="-115"
              width="265" />
@@ -907,10 +909,12 @@
              follows="left|top"
              height="19"
              initial_value="1"
-             label="ScaleV"
+             label="Scale v"
              label_width="205"
              layout="topleft"
              left="10"
+             min_val="-100"
+             max_val="100"
              name="gltfTextureScaleV"
              width="265" />
             <spinner
@@ -921,27 +925,33 @@
              label_width="205"
              layout="topleft"
              left="10"
+             min_val="-360"
+             max_val="360"
              name="gltfTextureRotation"
              width="265" />
             <spinner
              follows="left|top"
              height="19"
              initial_value="0"
-             label="TranslationU"
+             label="Offset u"
              label_width="205"
              layout="topleft"
              left="10"
-             name="gltfTextureTranslationU"
+             min_val="-999"
+             max_val="999"
+             name="gltfTextureOffsetU"
              width="265" />
             <spinner
              follows="left|top"
              height="19"
              initial_value="0"
-             label="TranslationV"
+             label="Offset v"
              label_width="205"
              layout="topleft"
              left="10"
-             name="gltfTextureTranslationV"
+             min_val="-999"
+             max_val="999"
+             name="gltfTextureOffsetV"
              width="265" />
             <!-- END PBR Material texture transform parameters -->
             <check_box
-- 
cgit v1.2.3


From 62aa0e807f9eb1eeb2db0296fc942bab2faa0e13 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Wed, 16 Nov 2022 12:04:16 -0800
Subject: SL-18632: Un-hide planar align options when editing GLTF textures in
 build floater

---
 indra/newview/skins/default/xui/en/panel_tools_texture.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 06e2a6e98e..ba5a20dd22 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -963,7 +963,7 @@
              left="7"
              name="checkbox planar align"
              tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping."
-             top_delta="16"
+             top_delta="43"
              width="260" />
 			<button
              follows="left|top"
-- 
cgit v1.2.3


From 8d2ac419b22c8c9475f2efb312dd198ac8eb9fb7 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 16 Nov 2022 14:49:17 -0600
Subject: SL-18154 Profile guided optimizations vs release viewer.  Trim some
 unused abilities and remove some more fast timers.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index cb2f24334c..cb1dec6c61 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2744,15 +2744,6 @@ function="World.EnvPreset"
                  function="Advanced.TogglePeriodicSlowFrame"
                  parameter="points" />
             </menu_item_check>
-            <menu_item_check
-             label="Frame Test"
-             name="Frame Test">
-                <menu_item_check.on_check
-                 function="Advanced.CheckFrameTest"
-                 parameter="Frame Test" />
-                <menu_item_check.on_click
-                 function="Advanced.ToggleFrameTest" />
-            </menu_item_check>
           <menu_item_call
              label="Frame Profile"
              name="Frame Profile">
-- 
cgit v1.2.3


From d2b8d5b3687efb20f2d74bc7100282a5f3e8693d Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 16 Nov 2022 23:37:48 +0200
Subject: SL-17699 Fixed drag and drop into material picker

---
 indra/newview/skins/default/xui/en/floater_texture_ctrl.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index 18631c3ae7..47de3b7576 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -19,7 +19,15 @@
     </floater.string>
     <floater.string
      name="pick title">
-        Pick:
+Pick:
+    </floater.string>
+    <floater.string
+     name="pick_material">
+PICK: MATERIAL
+    </floater.string>
+    <floater.string
+     name="pick_texture">
+PICK: TEXTURE
     </floater.string>
 
     <view
-- 
cgit v1.2.3


From 7edf1ac66f5004c82d2f219e007d0669062f3df0 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 18 Nov 2022 16:27:19 +0200
Subject: SL-18666 Allow tabbing between fields in Material editor floater

---
 indra/newview/skins/default/xui/en/floater_live_material_editor.xml | 2 ++
 indra/newview/skins/default/xui/en/floater_material_editor.xml      | 1 +
 2 files changed, 3 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_live_material_editor.xml b/indra/newview/skins/default/xui/en/floater_live_material_editor.xml
index 7759bc2399..5b7dab6a52 100644
--- a/indra/newview/skins/default/xui/en/floater_live_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_live_material_editor.xml
@@ -22,6 +22,8 @@
    layout="topleft"
    color="DkGray2"
    opaque="true"
+   tab_stop="true"
+   border="false"
    reserve_scroll_corner="false">
     <panel
      name="panel_material"
diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml
index 1a53d7832d..5b67fea19d 100644
--- a/indra/newview/skins/default/xui/en/floater_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -27,6 +27,7 @@
    layout="topleft"
    color="DkGray2"
    opaque="true"
+   tab_stop="true"
    border="false"
    reserve_scroll_corner="false">
     <panel
-- 
cgit v1.2.3


From ade79bc6f6b6269dbcb88f3dff2db6584d0c2f53 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 18 Nov 2022 21:06:48 +0200
Subject: SL-18677 Disable materials UI when materials caps are not available

---
 indra/newview/skins/default/xui/en/menu_inventory.xml     | 2 ++
 indra/newview/skins/default/xui/en/menu_inventory_add.xml | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 46dd0ada5d..5e2fd31301 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -474,6 +474,8 @@
       <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"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index 0e193521a3..fa40c5df90 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -104,6 +104,8 @@
               <menu_item_call.on_click
                function="Inventory.DoCreate"
                parameter="material" />
+              <menu_item_call.on_enable
+                      function="Inventory.MaterialsEnabled" />
             </menu_item_call>
             <menu
              height="175"
-- 
cgit v1.2.3


From e46323b0b9fea77522ee4637a82e2e86de15bb83 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 29 Nov 2022 10:50:25 -0600
Subject: SL-18682 WIP -- Clear BOOST_SELECTED as needed.  GL 3.2 compatibility
 pass.  Fix for stack underflow when reflection probes disabled.

---
 .../skins/default/xui/en/floater_preferences_graphics_advanced.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

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 4a08cc5285..75b50c0e39 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
@@ -666,7 +666,7 @@
    layout="topleft"
    left_delta="130"
    top_delta="0"
-   name="ReflectionDetial"
+   name="ReflectionDetail"
    width="150">
     <combo_box.item
       label="Disabled"
-- 
cgit v1.2.3


From b7e9f3ba4df02890700521f14614d5f5249cddf9 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Wed, 30 Nov 2022 15:13:25 -0800
Subject: SL-18746: Fix Align button ("Align current texture layers") being
 offset in build menu texture tab

---
 .../skins/default/xui/en/panel_tools_texture.xml   | 70 +++++++++++-----------
 1 file changed, 35 insertions(+), 35 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index ba5a20dd22..3bcbe0ca3a 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -891,6 +891,40 @@
              max_val="1"
              name="shinyOffsetV"
              width="265" />
+            <check_box
+             follows="top|left"
+             height="16"
+             initial_value="false"
+             label="Align planar faces"
+             layout="topleft"
+             left="7"
+             name="checkbox planar align"
+             tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping."
+             top_delta="20"
+             width="260" />
+			<button
+             follows="left|top"
+             layout="topleft"
+			 left="9"
+			 top="231"
+			 height="20"
+			 label="Align"
+			 label_selected="Align current texture layers"
+			 name="button align textures"
+			 tool_tip="Align current texture layers"
+			 width="66" />
+            <web_browser
+             visible="false"
+             enabled="false"
+             border_visible="true"
+             bottom_delta="0"
+             follows="top|left"
+             left="0"
+             name="title_media"
+             width="4"
+             height="4"
+             start_url="about:blank"
+             decouple_texture_size="true" />
             <!-- BEGIN PBR Material texture transform parameters -->
             <spinner
              follows="left|top"
@@ -903,7 +937,7 @@
              min_val="-100"
              max_val="100"
              name="gltfTextureScaleU"
-             top_delta="-115"
+             top_delta="34"
              width="265" />
             <spinner
              follows="left|top"
@@ -954,38 +988,4 @@
              name="gltfTextureOffsetV"
              width="265" />
             <!-- END PBR Material texture transform parameters -->
-            <check_box
-             follows="top|left"
-             height="16"
-             initial_value="false"
-             label="Align planar faces"
-             layout="topleft"
-             left="7"
-             name="checkbox planar align"
-             tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping."
-             top_delta="43"
-             width="260" />
-			<button
-             follows="left|top"
-             layout="topleft"
-			 left="9"
-			 top="231"
-			 height="20"
-			 label="Align"
-			 label_selected="Align current texture layers"
-			 name="button align textures"
-			 tool_tip="Align current texture layers"
-			 width="66" />
-            <web_browser
-             visible="false"
-             enabled="false"
-             border_visible="true"
-             bottom_delta="0"
-             follows="top|left"
-             left="0"
-             name="title_media"
-             width="4"
-             height="4"
-             start_url="about:blank"
-             decouple_texture_size="true" />
 </panel>
-- 
cgit v1.2.3


From b095194267389b0f5512fb14f18338bd256f3e81 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 30 Nov 2022 17:22:02 +0200
Subject: SL-18742 Upload materials option is missing from inventory's menu

---
 .../skins/default/xui/en/menu_inventory_add.xml    | 24 +++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index fa40c5df90..b04215872c 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -47,13 +47,23 @@
                  label="Model..."
                  layout="topleft"
                  name="Upload Model">
-                <menu_item_call.on_click
-                 function="File.UploadModel"
-                 parameter="" />
-                <menu_item_call.on_enable
-                 function="File.EnableUploadModel" />
-                <menu_item_call.on_visible
-                function="File.VisibleUploadModel"/>
+                   <menu_item_call.on_click
+                    function="File.UploadModel"
+                    parameter="" />
+                   <menu_item_call.on_enable
+                    function="File.EnableUploadModel" />
+                   <menu_item_call.on_visible
+                    function="File.VisibleUploadModel"/>
+                </menu_item_call>
+                <menu_item_call
+                 label="Material..."
+                 layout="topleft"
+                 name="Upload Material">
+                    <menu_item_call.on_click
+                     function="File.UploadMaterial"
+                     parameter="" />
+                    <menu_item_call.on_enable
+                     function="File.EnableUploadMaterial" />
                 </menu_item_call>
                 <menu_item_call
                  label="Bulk..."
-- 
cgit v1.2.3


From c0f598c10376f12310660a729f4a763dbf46368e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 1 Dec 2022 06:42:10 +0200
Subject: SL-18725 Texture picker should explain why dropping texture isn't
 allowed

Show a tooltip on drag&drop
---
 indra/newview/skins/default/xui/en/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index e7e1a24f5e..255aff06be 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -319,6 +319,11 @@ Only items with unrestricted
 'next owner' permissions
 can be attached to notecards.
 	</string>
+	<string name="TooltipTextureRestrictedDrop">
+Only textures with unrestricted
+copy and transfer permissions
+are allowed.
+	</string>
 
 	<!-- searching - generic -->
 	<string name="Searching">Searching...</string>
-- 
cgit v1.2.3


From c489481ec5edd0470553eca9b7c4cecfe994926c Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 6 Dec 2022 09:59:30 -0600
Subject: SL-18785 Fix for corrupt reflection probes on various preference
 changes.  Add UI for Screen Space Reflections.

---
 .../en/floater_preferences_graphics_advanced.xml   | 42 +++++++++++++++++-----
 1 file changed, 34 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins/default')

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 75b50c0e39..8ce365878a 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
@@ -647,31 +647,57 @@
        name="2"
        value="2"/>
   </combo_box>
+
+  <check_box
+    control_name="RenderReflectionsEnabled"
+    height="16"
+    initial_value="true"
+    label="Reflections (requires restart)"
+    layout="topleft"
+    left="420"
+    name="ReflectionsEnabled"
+    top_delta="16"
+    width="240">
+    <check_box.commit_callback
+      function="Pref.RenderOptionUpdate" />
+  </check_box>
+
+  <check_box
+    control_name="RenderScreenSpaceReflections"
+    height="16"
+    initial_value="true"
+    label="Screen Space Reflections"
+    layout="topleft"
+    left="440"
+    name="ScreenSpaceReflections"
+    top_delta="16"
+    width="240">
+    <check_box.commit_callback
+      function="Pref.RenderOptionUpdate" />
+  </check_box>
+  
   <text
     type="string"
     length="1"
     follows="left|top"
     height="16"
     layout="topleft"
-    left="420"
-    name="RenderReflectionDetailText"
+    left="440"
+    name="ReflectionDetailText"
     text_readonly_color="LabelDisabledColor"
     top_delta="16"
     width="128">
-    Reflections:
+    Reflection Detail:
   </text>
+
   <combo_box
    control_name="RenderReflectionProbeDetail"
    height="18"
    layout="topleft"
-   left_delta="130"
+   left_delta="110"
    top_delta="0"
    name="ReflectionDetail"
    width="150">
-    <combo_box.item
-      label="Disabled"
-      name="0"
-      value="-1"/>
     <combo_box.item
       label="Static Only"
       name="0"
-- 
cgit v1.2.3


From 03da83f23513fdca2073203eddafeef3662e4be1 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 6 Dec 2022 10:18:46 -0600
Subject: SL-18788 Fix for legacy shiny not working until after restart when
 reflections probes are disabled.

---
 .../skins/default/xui/en/floater_preferences_graphics_advanced.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

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 8ce365878a..7f03fbe7c3 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
@@ -652,7 +652,7 @@
     control_name="RenderReflectionsEnabled"
     height="16"
     initial_value="true"
-    label="Reflections (requires restart)"
+    label="Reflections"
     layout="topleft"
     left="420"
     name="ReflectionsEnabled"
-- 
cgit v1.2.3


From e9e37aa2ad2315611f262b2b090fe9672f6fee04 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 6 Dec 2022 16:15:27 -0600
Subject: SL-18784 Refactor physics shape display to not require its own render
 target.  Remove "Hover Glow Objects" to free up a superfluous render target.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index cb1dec6c61..a3c365e60c 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3247,16 +3247,6 @@ function="World.EnvPreset"
                  function="Advanced.HandleAttachedLightParticles"
                  parameter="RenderAttachedParticles" />
             </menu_item_check>
-            <menu_item_check
-             label="Hover Glow Objects"
-             name="Hover Glow Objects">
-                <menu_item_check.on_check
-                 function="CheckControl"
-                 parameter="RenderHoverGlowEnable" />
-                <menu_item_check.on_click
-                 function="ToggleControl"
-                 parameter="RenderHoverGlowEnable" />
-            </menu_item_check>
             <menu_item_call
               enabled="true"
               label="Rebuild Reflection Probes"
-- 
cgit v1.2.3


From c9c611fd12f55ac6d6717ba17139ba61a6db581f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 13 Dec 2022 03:36:09 +0200
Subject: SL-18647 Removed obsolete Material Editor button

Was a placeholder when there was no other way to bring it up
---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index a3c365e60c..bb9aab9ec0 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1606,13 +1606,6 @@ function="World.EnvPreset"
                  parameter="" />
             </menu_item_call>
         </menu>
-        <menu_item_call
-            label="Material Editor"
-            name="material_editor_menu_item">
-          <menu_item_call.on_click
-              function="Floater.ToggleOrBringToFront"
-              parameter="material_editor" />
-        </menu_item_call>
 
       <menu_item_separator/>
         <menu_item_call
-- 
cgit v1.2.3


From 5fcfe95422b4c3a5434b3eb711cd12401d4329d3 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 13 Dec 2022 16:13:49 -0600
Subject: SL-18782 Make primitive parameters automatically follow Reflection
 Probe controls.

---
 indra/newview/skins/default/xui/en/notifications.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 1dc979fda6..270fa492de 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -12019,4 +12019,16 @@ Unpacking: [UNPACK_TIME]s [USIZE]KB
  type="notifytip">
 Material successfully created.  Asset ID: [ASSET_ID]
 </notification>
+
+  <notification
+    icon="notifytip.tga"
+    name="ReflectionProbeApplied"
+    persist="true"
+    type="alertmodal">
+    Your object has been set to the default Reflection Probe state, which is an invisible, phantom, 5m sphere.  To learn more about Reflection Probes and how to use them, see the Knowledge Base.
+    <usetemplate ignoretext="Reflection Probe tips"
+                 name="okignore"
+                 yestext="OK"/>
+  </notification>
+  
 </notifications>
-- 
cgit v1.2.3


From 4d0bd020a0e3ce87731478bbb74e93b96a64b74e Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 14 Dec 2022 16:17:48 -0600
Subject: SL-18782 WIP -- Functional Build->Options->Show Reflection Probe
 Volumes

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index bb9aab9ec0..2512fadec7 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1464,6 +1464,15 @@ function="World.EnvPreset"
                     <menu_item_check.on_click
                      function="Tools.ShowSelectionLightRadius" />
                 </menu_item_check>
+                <menu_item_check
+                       label="Show Reflection Probe Volumes"
+                       name="Show Reflection Probe Volumes">
+                  <menu_item_check.on_check
+                   control="RenderReflectionProbeVolumes" />
+                  <menu_item_check.on_click
+                     function="ToggleControl"
+                     parameter="RenderReflectionProbeVolumes" />
+                </menu_item_check>
                 <menu_item_check
                  label="Show Selection Beam"
                  name="Show Selection Beam">
-- 
cgit v1.2.3


From a21ef13880426a8d384002f4d49dd9d506672671 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 6 Jan 2023 17:58:23 +0200
Subject: SL-18907 Add Reflection Probe Ambiance slider to Personal Lighting
 Floater

---
 .../default/xui/en/floater_adjust_environment.xml     | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'indra/newview/skins/default')

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 f4a686bae1..39fe573c98 100644
--- a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
+++ b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
@@ -252,6 +252,25 @@
                             top_pad="5"
                             width="185"
                             can_edit_text="true"/>
+                  <text follows="left|top"
+                          height="10"
+                          layout="topleft"
+                          left_delta="-5"
+                          top_pad="15"
+                          width="180">Reflection Probe Ambiance:</text>
+                  <slider decimal_digits="3"
+                          follows="left|top"
+                          height="16"
+                          increment="0.01"
+                          initial_value="0"
+                          layout="topleft"
+                          left_delta="5"
+                          min_val="0"
+                          max_val="1"
+                          name="probe_ambiance"
+                          top_pad="5"
+                          width="185"
+                          can_edit_text="true"/>
                 </layout_panel>
                 <layout_panel border="false"
                               bevel_style="in"
-- 
cgit v1.2.3


From 887b4818751c84609ee5e8f9636be41391e444fd Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 12 Jan 2023 09:57:11 +0200
Subject: SL-18947 Disable 'save' buttons by default, until material gets
 loaded

---
 indra/newview/skins/default/xui/en/floater_material_editor.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml
index 5b67fea19d..6adfa40733 100644
--- a/indra/newview/skins/default/xui/en/floater_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -70,6 +70,7 @@
                follows="left|top"
                height="25"
                label="Save"
+               enabled="false"
                layout="topleft"
                name="save"
                top_pad="7"
@@ -79,6 +80,7 @@
                follows="left|top"
                height="25"
                label="Save As..."
+               enabled="false"
                layout="topleft"
                name="save_as"
                top_delta="0"
-- 
cgit v1.2.3


From 7f0fed273c0161c44704443e1cc5ac139d49edd4 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 25 Jan 2023 15:29:21 +0200
Subject: SL-17640 Make Materials Upload UI localizable

---
 .../skins/default/xui/en/panel_gltf_material.xml   | 34 ++++++++++++++--------
 1 file changed, 22 insertions(+), 12 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_gltf_material.xml b/indra/newview/skins/default/xui/en/panel_gltf_material.xml
index 2936b3cb63..6975525b3d 100644
--- a/indra/newview/skins/default/xui/en/panel_gltf_material.xml
+++ b/indra/newview/skins/default/xui/en/panel_gltf_material.xml
@@ -37,7 +37,8 @@
       layout="topleft"
       left="10"
       top="5"
-      width="128">
+      width="128"
+      name="base_color_lbl">
       Base Color:
     </text>
     <texture_picker
@@ -73,7 +74,8 @@
       height="10"
       layout="topleft"
       left_pad="5"
-      top="8">
+      top="8"
+      name="base_color_tint_lbl">
       Tint
     </text>
     <color_swatch
@@ -94,7 +96,8 @@
       layout="topleft"
       left_delta="0"
       top_pad="5"
-      width="96">
+      width="96"
+      name="base_color_transparency_lbl">
       Transparency
     </text>
     <spinner
@@ -117,10 +120,10 @@
       height="10"
       layout="topleft"
       left_delta="0"
-      name="label alphamode"
       text_readonly_color="LabelDisabledColor"
       top_pad="5"
-      width="90">
+      width="90"
+      name="alpha_mode_lbl">
       Alpha mode
     </text>
     <combo_box
@@ -151,7 +154,8 @@
       layout="topleft"
       left_delta="0"
       top_pad="5"
-      width="96">
+      width="96"
+      name="alpha_cutoff_lbl">
       Alpha Cutoff
     </text>
     <spinner
@@ -186,7 +190,8 @@
       height="10"
       layout="topleft"
       left="10"
-      top="5">
+      top="5"
+      name="metallic_roughness_lbl">
       Metallic-Roughness:
     </text>
     <texture_picker
@@ -222,7 +227,8 @@
       height="10"
       layout="topleft"
       left_pad="5"
-      top="8">
+      top="8"
+      name="metallic_factor_lbl">
       Metallic Factor
     </text>
     <spinner
@@ -246,7 +252,8 @@
       layout="topleft"
       left_delta="0"
       top_pad="5"
-      width="96">
+      width="96"
+      name="roughness_factor_lbl">
       Roughness Factor
     </text>
     <spinner
@@ -282,7 +289,8 @@
       layout="topleft"
       left="10"
       top="5"
-      width="64">
+      width="64"
+      name="emissive_lbl">
       Emissive:
     </text>
     <texture_picker
@@ -317,7 +325,8 @@
       height="10"
       layout="topleft"
       left_pad="5"
-      top="8">
+      top="8"
+      name="emissive_tint_lbl">
       Tint
     </text>
     <color_swatch
@@ -350,7 +359,8 @@
       layout="topleft"
       left="10"
       top="5"
-      width="64">
+      width="64"
+      name="normal_lbl">
       Normal:
     </text>
     <texture_picker
-- 
cgit v1.2.3


From 473ade269628d1fb6cbc7b96a91e1c0aec1b8e59 Mon Sep 17 00:00:00 2001
From: Henri Beauchamp <sldevel@users.noreply.github.com>
Date: Tue, 31 Jan 2023 17:42:51 +0100
Subject: SL-19110 Fast hashing classes for use in place of the slow LLMD5,
 where speed matters. (#64)

This commit adds the HBXX64 and HBXX128 classes for use as a drop-in
replacement for the slow LLMD5 hashing class, where speed matters and
backward compatibility (with standard hashing algorithms) and/or
cryptographic hashing qualities are not required.
It also replaces LLMD5 with HBXX* in a few existing hot (well, ok, just
"warm" for some) paths meeting the above requirements, while paving the way for
future use cases, such as in the DRTVWR-559 and sibling branches where the slow
LLMD5 is used (e.g. to hash materials and vertex buffer cache entries), and
could be use such a (way) faster algorithm with very significant benefits and
no negative impact.

Here is the comment I added in indra/llcommon/hbxx.h:

// HBXXH* classes are to be used where speed matters and cryptographic quality
// is not required (no "one-way" guarantee, though they are likely not worst in
// this respect than MD5 which got busted and is now considered too weak). The
// xxHash code they are built upon is vectorized and about 50 times faster than
// MD5. A 64 bits hash class is also provided for when 128 bits of entropy are
// not needed. The hashes collision rate is similar to MD5's.
// See https://github.com/Cyan4973/xxHash#readme for details.
---
 indra/newview/skins/default/xui/da/floater_about.xml | 1 +
 indra/newview/skins/default/xui/de/floater_about.xml | 1 +
 indra/newview/skins/default/xui/en/floater_about.xml | 1 +
 indra/newview/skins/default/xui/es/floater_about.xml | 1 +
 indra/newview/skins/default/xui/fr/floater_about.xml | 1 +
 indra/newview/skins/default/xui/it/floater_about.xml | 1 +
 indra/newview/skins/default/xui/ja/floater_about.xml | 1 +
 indra/newview/skins/default/xui/pt/floater_about.xml | 1 +
 indra/newview/skins/default/xui/ru/floater_about.xml | 1 +
 indra/newview/skins/default/xui/tr/floater_about.xml | 1 +
 indra/newview/skins/default/xui/zh/floater_about.xml | 1 +
 11 files changed, 11 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/da/floater_about.xml b/indra/newview/skins/default/xui/da/floater_about.xml
index b322e67bb7..7bcae69779 100644
--- a/indra/newview/skins/default/xui/da/floater_about.xml
+++ b/indra/newview/skins/default/xui/da/floater_about.xml
@@ -70,6 +70,7 @@ PCRE Copyright (c) 1997-2008 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-2002 Jean-loup Gailly and Mark Adler.
 google-perftools Copyright (c) 2005, Google Inc.
 
diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml
index b2708f7141..10ccf0d5da 100644
--- a/indra/newview/skins/default/xui/de/floater_about.xml
+++ b/indra/newview/skins/default/xui/de/floater_about.xml
@@ -29,6 +29,7 @@ mit Open-Source-Beiträgen von:</text>
         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 und Mark Adler.
 
         Second Life Viewer verwendet Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (und Lizenzgeber). Alle Rechte vorbehalten. Details siehe www.havok.com.
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index eb07425dfe..1ad7811d85 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -112,6 +112,7 @@ Dummy Name replaced at run time
         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.
 
         Second Life Viewer uses Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (and its Licensors). All Rights Reserved. See www.havok.com for details.
diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml
index f59f534908..e14ba32f69 100644
--- a/indra/newview/skins/default/xui/es/floater_about.xml
+++ b/indra/newview/skins/default/xui/es/floater_about.xml
@@ -29,6 +29,7 @@ con contribuciones de código abierto de:</text>
         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 y Mark Adler.
 
         El visor de Second Life usa Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (y sus licenciadores). Reservados todos los derechos. Vea los detalles en www.havok.com.
diff --git a/indra/newview/skins/default/xui/fr/floater_about.xml b/indra/newview/skins/default/xui/fr/floater_about.xml
index df6b61e293..09da1fb5fd 100644
--- a/indra/newview/skins/default/xui/fr/floater_about.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about.xml
@@ -29,6 +29,7 @@ avec les contributions Open Source de :</text>
         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 et Mark Adler.
 
         Le client Second Life utilise Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (et ses concédants de licence). Tous droits réservés. Pour plus de détails, consultez le site Web www.havok.com.
diff --git a/indra/newview/skins/default/xui/it/floater_about.xml b/indra/newview/skins/default/xui/it/floater_about.xml
index edb334e13e..7e195d3ca9 100644
--- a/indra/newview/skins/default/xui/it/floater_about.xml
+++ b/indra/newview/skins/default/xui/it/floater_about.xml
@@ -29,6 +29,7 @@ con contributi open source da:</text>
         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 e Mark Adler.
 
         Il Viewer Second Life utilizza Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (e licenziatari). Tutti i diritti riservati. Per informazioni dettagliate, vedere www.havok.com.
diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml
index 6a39d057e2..22a65003d3 100644
--- a/indra/newview/skins/default/xui/ja/floater_about.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about.xml
@@ -29,6 +29,7 @@ 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.
 
 Second Life ビューワでは Havok (TM) Physics が使用されています。(c)Copyright 1999-2010 Havok.com Inc. (and its Licensors).無断複写・複製・転載を禁じます。詳細については www.havok.com をご参照ください。
diff --git a/indra/newview/skins/default/xui/pt/floater_about.xml b/indra/newview/skins/default/xui/pt/floater_about.xml
index 3c0ca332ac..aaed728f84 100644
--- a/indra/newview/skins/default/xui/pt/floater_about.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about.xml
@@ -29,6 +29,7 @@ com contribuições de código aberto de:</text>
         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.
 
         O Visualizador do Second Life usa Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (e seus Licenciantes). Todos os direitos reservados. Consulte www.havok.com para obter detalhes.
diff --git a/indra/newview/skins/default/xui/ru/floater_about.xml b/indra/newview/skins/default/xui/ru/floater_about.xml
index 44216e0430..a65a979ccd 100644
--- a/indra/newview/skins/default/xui/ru/floater_about.xml
+++ b/indra/newview/skins/default/xui/ru/floater_about.xml
@@ -29,6 +29,7 @@
         SDL (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
         SSLeay (C) 1995-1998 Eric Young (eay@cryptsoft.com)
         xmlrpc-epi (C) 2000 Epinions, Inc.
+        xxHash Copyright (C) 2012-2020 Yann Collet.
         zlib (C) 1995-2012 Jean-loup Gailly и Mark Adler.
 
         В клиенте Second Life используется технология Havok (TM) Physics. (C) 1999-2010 Havok.com Inc. (и лицензиары компании). Все права защищены. Подробнее см. веб-сайт www.havok.com.
diff --git a/indra/newview/skins/default/xui/tr/floater_about.xml b/indra/newview/skins/default/xui/tr/floater_about.xml
index faa504a996..40ca3707c3 100644
--- a/indra/newview/skins/default/xui/tr/floater_about.xml
+++ b/indra/newview/skins/default/xui/tr/floater_about.xml
@@ -29,6 +29,7 @@ açık kaynak kod katkısında bulunanlar şunlardır:</text>
         SDL Telif Hakkı (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
         SSLeay Telif Hakkı (C) 1995-1998 Eric Young (eay@cryptsoft.com)
         xmlrpc-epi Telif Hakkı (C) 2000 Epinions, Inc.
+        xxHash Copyright (C) 2012-2020 Yann Collet.
         zlib Telif Hakkı (C) 1995-2012 Jean-loup Gailly ve Mark Adler.
 
         Second Life Görüntüleyicisi Havok (TM) Fizik motorunu kullanmaktadır. (c)Telif Hakkı 1999-2010 Havok.com Inc. (ve Lisans Verenleri). Tüm Hakları Saklıdır. Ayrıntılı bilgi için bkz. www.havok.com
diff --git a/indra/newview/skins/default/xui/zh/floater_about.xml b/indra/newview/skins/default/xui/zh/floater_about.xml
index d7d2a52750..a56ae753d1 100644
--- a/indra/newview/skins/default/xui/zh/floater_about.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about.xml
@@ -29,6 +29,7 @@
         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.
 
         第二人生 Viewer 採用 Havok (TM) 物理引擎。 (c)Copyright 1999-2010 Havok.com Inc.（及其放照人）。 保留一切權利。 詳情見 www.havok.com。
-- 
cgit v1.2.3


From 830cb6b66551025285120fb628f0b5ebf3841756 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 3 Feb 2023 17:18:39 -0600
Subject: SL-19148 Decruft some forward shaders and drawpools.  Fix HUDs being
 in wrong color space.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 2512fadec7..b8515cb096 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2046,17 +2046,6 @@ function="World.EnvPreset"
                  function="Advanced.ToggleRenderType"
                  parameter="water" />
             </menu_item_check>
-            <menu_item_check
-             label="Ground"
-             name="Rendering Type Ground"
-             shortcut="control|alt|shift|8">
-                <menu_item_check.on_check
-                 function="Advanced.CheckRenderType"
-                 parameter="ground" />
-                <menu_item_check.on_click
-                 function="Advanced.ToggleRenderType"
-                 parameter="ground" />
-            </menu_item_check>
             <menu_item_check
              label="Volume"
              name="Rendering Type Volume"
-- 
cgit v1.2.3


From 95de63eaa3bab44dc435d1448d0732d6ffe13544 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 8 Feb 2023 11:10:15 -0600
Subject: DRTVWR-559 Remove some 32-bit color paranoia checks (potential fix
 for running under wine)

---
 indra/newview/skins/default/xui/en/strings.xml | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 7177cb1273..67ea085c55 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3005,16 +3005,6 @@ Running in window.
 	<string name="MBDevContextErr">Can't make GL device context</string>
 	<string name="MBPixelFmtErr">Can't find suitable pixel format</string>
 	<string name="MBPixelFmtDescErr">Can't get pixel format description</string>
-	<string name="MBTrueColorWindow">
-		[APP_NAME] requires True Color (32-bit) to run.
-Please go to your computer's display settings and set the color mode to 32-bit.
-	</string>
-	<string name="MBAlpha">
-		[APP_NAME] is unable to run because it can't get an 8 bit alpha channel.  Usually this is due to video card driver issues.
-Please make sure you have the latest video card drivers installed.
-Also be sure your monitor is set to True Color (32-bit) in Control Panels &gt; Display &gt; Settings.
-If you continue to receive this message, contact the [SUPPORT_SITE].
-	</string>
 	<string name="MBPixelFmtSetErr">Can't set pixel format</string>
 	<string name="MBGLContextErr">Can't create GL rendering context</string>
 	<string name="MBGLContextActErr">Can't activate GL rendering context</string>
-- 
cgit v1.2.3


From 74275f590e75fc8b1685b77a39529cc91ad084b9 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 15 Feb 2023 14:47:33 -0600
Subject: SL-18927 Warn *before* destroying content, not after.  Followup from
 last commit -- immediately apply scale to sphere probes.

---
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 7cdf4af5c2..711be76764 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -12041,7 +12041,7 @@ Material successfully created.  Asset ID: [ASSET_ID]
     name="ReflectionProbeApplied"
     persist="true"
     type="alertmodal">
-    Your object has been set to the default Reflection Probe state, which is an invisible, phantom, 5m sphere.  To learn more about Reflection Probes and how to use them, see the Knowledge Base.
+    WARNING: You have made your object a Refelction Probe.  Continuing to manipulate the object while it is a probe will implicitly change the object to mimic its influence volume and will make irreversible changes to the object.  If you don't know what a reflection probe is, uncheck "Reflection Probe" immediately.  To learn more about Reflection Probes and how to use them, see https://wiki.secondlife.com/wiki/PBR_Materials#Understanding_and_Assisting_the_New_Reflections_System.
     <usetemplate ignoretext="Reflection Probe tips"
                  name="okignore"
                  yestext="OK"/>
-- 
cgit v1.2.3


From 9606f2afbb3ca81d184c6b7decbbe4f3ae360272 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 24 Feb 2023 15:41:51 -0600
Subject: DRTVWR-559 Add controls for tonemapper to advanced preferences.

---
 .../en/floater_preferences_graphics_advanced.xml   | 55 ++++++++++++++++++++++
 1 file changed, 55 insertions(+)

(limited to 'indra/newview/skins/default')

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 7f03fbe7c3..a08831b396 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
@@ -712,6 +712,61 @@
       value="2"/>
   </combo_box>
 
+
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    left="420"
+    name="RenderTonemapperText"
+    text_readonly_color="LabelDisabledColor"
+    top_delta="24"
+    width="128">
+    Tonemapper:
+  </text>
+  <combo_box
+   control_name="RenderTonemapper"
+   height="18"
+   layout="topleft"
+   left_delta="130"
+   top_delta="0"
+   name="ToneMapper"
+   width="150">
+    <combo_box.item
+      label="Linear"
+      name="0"
+      value="0"/>
+    <combo_box.item
+      label="ACES Narkowicz"
+      name="1"
+      value="1"/>
+    <combo_box.item
+      label="ACES Hill"
+      name="2"
+      value="2"/>
+  </combo_box>
+
+    <slider
+    control_name="RenderExposure"
+    decimal_digits="1"
+    follows="left|top"
+    height="16"
+    increment="0.1"
+    initial_value="160"
+    label="Exposure:"
+    label_width="145"
+    layout="topleft"
+    left="420"
+    min_val="0.5"
+    max_val="4.0"
+    name="RenderExposure"
+    show_text="true"
+    top_delta="20"
+    width="260">
+  </slider>
+
   <!-- End of Advanced Settings block -->
 	<view_border
       bevel_style="in"
-- 
cgit v1.2.3


From 36f37ebf8a97cf1d5dacf6c8df41bf08375ac002 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 28 Feb 2023 12:08:25 -0600
Subject: SL-19263 Tidy up the reflection probe warning modal and add a cancel
 button.

---
 indra/newview/skins/default/xui/en/notifications.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 711be76764..bf67118eac 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -12041,10 +12041,12 @@ Material successfully created.  Asset ID: [ASSET_ID]
     name="ReflectionProbeApplied"
     persist="true"
     type="alertmodal">
-    WARNING: You have made your object a Refelction Probe.  Continuing to manipulate the object while it is a probe will implicitly change the object to mimic its influence volume and will make irreversible changes to the object.  If you don't know what a reflection probe is, uncheck "Reflection Probe" immediately.  To learn more about Reflection Probes and how to use them, see https://wiki.secondlife.com/wiki/PBR_Materials#Understanding_and_Assisting_the_New_Reflections_System.
-    <usetemplate ignoretext="Reflection Probe tips"
-                 name="okignore"
-                 yestext="OK"/>
+    WARNING: You have made your object a Reflection Probe.  This will implicitly change the object to mimic its influence volume and will make irreversible changes to the object.  Do you want to continue?
+   <usetemplate
+       ignoretext="Reflection Probe tips"
+       name="okcancelignore"
+       notext="Cancel"
+       yestext="OK"/>
   </notification>
   
 </notifications>
-- 
cgit v1.2.3


From e42d97d027282a76923f85fd1f61e55ee8b1eeea Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 28 Feb 2023 12:52:38 -0600
Subject: SL-18435 Rename texture tab combo box items and change "PBR" label on
 material swatch to "Material"

---
 indra/newview/skins/default/xui/en/panel_tools_texture.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 3bcbe0ca3a..67bdd189c1 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -140,11 +140,11 @@
              top_pad="17"
              width="90">
                 <combo_box.item
-                 label="Materials"
+                 label="Blinn-Phong"
                  name="Materials"
                  value="Materials" />
                 <combo_box.item
-                 label="PBR"
+                 label="PBR Metallic Roughness"
                  name="PBR"
                  value="PBR" />
                 <combo_box.item
@@ -256,7 +256,7 @@
              allow_no_texture="true"
              follows="left|top"
              height="80"
-             label="PBR       "
+             label="Material"
              layout="topleft"
              left="10"
              name="pbr_control"
-- 
cgit v1.2.3


From b9b913a60ada97fc61bf2176e443dc72c8359ccb Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 7 Mar 2023 09:38:43 -0600
Subject: SL-19349 Fix for hang on bulk upload of materials, add bulk upload
 option to material selector, incidental decruft.

---
 indra/newview/skins/default/xui/en/floater_material_editor.xml          | 1 +
 .../skins/default/xui/en/floater_preferences_graphics_advanced.xml      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml
index 6adfa40733..1c58ea6977 100644
--- a/indra/newview/skins/default/xui/en/floater_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -15,6 +15,7 @@
   <string name="upload_fee_string">L$[FEE] upload fee</string>
   <string name="material_selection_title">Material selection</string>
   <string name="material_selection_text">Select material:</string>
+  <string name="material_batch_import_text">--- Bulk Upload All ---</string>
   <string name="material_override_title">Editing Material</string>
 
   <scroll_container
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 a08831b396..534c4c3686 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
@@ -589,7 +589,7 @@
     control_name="RenderDeferredSSAO"
     height="16"
     initial_value="true"
-    label="Ambient Occlusion"
+    label="Screen Space Ambient Occlusion"
     layout="topleft"
     left="420"
     name="UseSSAO"
-- 
cgit v1.2.3


From d423263d54fc72cf857f3e147ac3860ca16c652f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 23 Mar 2023 01:18:07 +0200
Subject: SL-19169 Local material updates aren't applied with non-default
 transforms

---
 indra/newview/skins/default/xui/en/floater_material_editor.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml
index 1c58ea6977..a6a401f43e 100644
--- a/indra/newview/skins/default/xui/en/floater_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -29,7 +29,6 @@
    color="DkGray2"
    opaque="true"
    tab_stop="true"
-   border="false"
    reserve_scroll_corner="false">
     <panel
      name="panel_material"
-- 
cgit v1.2.3


From 698966f8e7ddcc0b123a83d7c4e381778f8cd8ab Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Tue, 4 Apr 2023 12:29:12 -0500
Subject: =?UTF-8?q?SL-19538=20Remove=20hacky=20ambiance=20scale=20and=20ta?=
 =?UTF-8?q?ke=20the=20mittens=20off=20probe=20a=E2=80=A6=20(#151)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* SL-19538 Remove hacky ambiance scale and take the mittens off probe ambiance values.  Fix for sky brightening being done in sRGB space.
---
 indra/newview/skins/default/xui/en/floater_adjust_environment.xml | 2 +-
 indra/newview/skins/default/xui/en/floater_tools.xml              | 2 +-
 indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default')

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 39fe573c98..f6bfb3574d 100644
--- a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
+++ b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
@@ -266,7 +266,7 @@
                           layout="topleft"
                           left_delta="5"
                           min_val="0"
-                          max_val="1"
+                          max_val="10"
                           name="probe_ambiance"
                           top_pad="5"
                           width="185"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 1faf9c3152..5e999ed245 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2574,7 +2574,7 @@ even though the user gets a free copy.
                    label="Ambiance"
                    label_width="55"
                    left="10"
-                   max_val="1"
+                   max_val="100"
                    min_val="0"
                    mouse_opaque="true"
                    name="Probe Ambiance"
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 094be36b01..a80b1a9166 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
@@ -333,7 +333,7 @@
                           layout="topleft"
                           left_delta="5"
                           min_val="0"
-                          max_val="1"
+                          max_val="10"
                           name="probe_ambiance"
                           top_delta="20"
                           width="219"
-- 
cgit v1.2.3


From bb79718c8f0050569c80a1bfe4dd428321706d1a Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 6 Apr 2023 13:21:25 -0500
Subject: SL-19538 Followup -- scrub all possible sources of NaNs, make dynamic
 exposure controls not persist, limit exposure range, and do a debug gl pass.

---
 .../skins/default/xui/en/floater_preferences_graphics_advanced.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

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 534c4c3686..17875e9c19 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
@@ -760,7 +760,7 @@
     layout="topleft"
     left="420"
     min_val="0.5"
-    max_val="4.0"
+    max_val="1.5"
     name="RenderExposure"
     show_text="true"
     top_delta="20"
-- 
cgit v1.2.3


From 413ce656c8e910bf3758afc3fa354e07be2d4561 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 7 Apr 2023 14:10:53 -0500
Subject: SL-19538 Clear probes on sky setting slam.  Better probe update
 prioritization.  Incidental decruft.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index b8515cb096..d77415877c 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3238,13 +3238,6 @@ function="World.EnvPreset"
                  function="Advanced.HandleAttachedLightParticles"
                  parameter="RenderAttachedParticles" />
             </menu_item_check>
-            <menu_item_call
-              enabled="true"
-              label="Rebuild Reflection Probes"
-              name="Rebuild Reflection Probes">
-              <menu_item_call.on_click
-               function="Develop.RebuildReflectionProbes" />
-            </menu_item_call>
           <menu_item_separator />
           
           <menu_item_call
-- 
cgit v1.2.3


From 2b2154f0217758b27b544d066024d922ba234d51 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Tue, 11 Apr 2023 15:09:58 -0500
Subject: SL-19564 Rebalance exposure and sky.  Hack legacy diffuse map
 saturation and brightness to allow ACES Hill all the time.

---
 .../en/floater_preferences_graphics_advanced.xml   | 36 ----------------------
 indra/newview/skins/default/xui/en/menu_viewer.xml | 32 ++++++++++++-------
 2 files changed, 21 insertions(+), 47 deletions(-)

(limited to 'indra/newview/skins/default')

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 17875e9c19..16b965843d 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
@@ -712,42 +712,6 @@
       value="2"/>
   </combo_box>
 
-
-  <text
-    type="string"
-    length="1"
-    follows="left|top"
-    height="16"
-    layout="topleft"
-    left="420"
-    name="RenderTonemapperText"
-    text_readonly_color="LabelDisabledColor"
-    top_delta="24"
-    width="128">
-    Tonemapper:
-  </text>
-  <combo_box
-   control_name="RenderTonemapper"
-   height="18"
-   layout="topleft"
-   left_delta="130"
-   top_delta="0"
-   name="ToneMapper"
-   width="150">
-    <combo_box.item
-      label="Linear"
-      name="0"
-      value="0"/>
-    <combo_box.item
-      label="ACES Narkowicz"
-      name="1"
-      value="1"/>
-    <combo_box.item
-      label="ACES Hill"
-      name="2"
-      value="2"/>
-  </combo_box>
-
     <slider
     control_name="RenderExposure"
     decimal_digits="1"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index d77415877c..4a92bdc601 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -902,17 +902,27 @@
                  function="World.EnableEnvSettings" 
                  parameter="sunrise" />
             </menu_item_check>
-            <menu_item_check
-             label="Midday"
-             name="Noon"
-             shortcut="control|shift|Y">
-                <menu_item_check.on_click
-                 function="World.EnvSettings"
-                 parameter="noon" />
-                <menu_item_check.on_check
-                 function="World.EnableEnvSettings" 
-                 parameter="noon" />
-            </menu_item_check>
+          <menu_item_check
+           label="Midday"
+           name="Noon"
+           shortcut="control|shift|Y">
+            <menu_item_check.on_click
+             function="World.EnvSettings"
+             parameter="noon" />
+            <menu_item_check.on_check
+             function="World.EnableEnvSettings"
+             parameter="noon" />
+          </menu_item_check>
+          <menu_item_check
+             label="Midday (Legacy)"
+             name="legacy noon">
+            <menu_item_check.on_click
+             function="World.EnvSettings"
+             parameter="legacy noon" />
+            <menu_item_check.on_check
+             function="World.EnableEnvSettings"
+             parameter="legacy noon" />
+          </menu_item_check>
             <menu_item_check
              label="Sunset"
              name="Sunset"
-- 
cgit v1.2.3


From 37eee397b70e2a13a1309025207d1c301f7070c5 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Tue, 18 Apr 2023 19:11:38 -0500
Subject: DRTVWR-559 Add control for automatic reflection probes to advanced
 preferences and featuretable. Remove Reflections checkbox.  Don't persist
 reflection probe volume display between sessions.  Incidental decruft.

---
 .../en/floater_preferences_graphics_advanced.xml   | 62 +++++++++++++++-------
 1 file changed, 44 insertions(+), 18 deletions(-)

(limited to 'indra/newview/skins/default')

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 16b965843d..d867123c4b 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
@@ -648,27 +648,13 @@
        value="2"/>
   </combo_box>
 
-  <check_box
-    control_name="RenderReflectionsEnabled"
-    height="16"
-    initial_value="true"
-    label="Reflections"
-    layout="topleft"
-    left="420"
-    name="ReflectionsEnabled"
-    top_delta="16"
-    width="240">
-    <check_box.commit_callback
-      function="Pref.RenderOptionUpdate" />
-  </check_box>
-
   <check_box
     control_name="RenderScreenSpaceReflections"
     height="16"
     initial_value="true"
     label="Screen Space Reflections"
     layout="topleft"
-    left="440"
+    left="420"
     name="ScreenSpaceReflections"
     top_delta="16"
     width="240">
@@ -682,7 +668,7 @@
     follows="left|top"
     height="16"
     layout="topleft"
-    left="440"
+    left="420"
     name="ReflectionDetailText"
     text_readonly_color="LabelDisabledColor"
     top_delta="16"
@@ -694,7 +680,7 @@
    control_name="RenderReflectionProbeDetail"
    height="18"
    layout="topleft"
-   left_delta="110"
+   left_delta="130"
    top_delta="0"
    name="ReflectionDetail"
    width="150">
@@ -712,7 +698,47 @@
       value="2"/>
   </combo_box>
 
-    <slider
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    left="420"
+    name="ReflectionProbeText"
+    text_readonly_color="LabelDisabledColor"
+    top_delta="16"
+    width="128">
+    Reflection Coverage:
+  </text>
+
+  <combo_box
+   control_name="RenderReflectionProbeLevel"
+   height="18"
+   layout="topleft"
+   left_delta="130"
+   top_delta="0"
+   name="ReflectionLevel"
+   width="150">
+    <combo_box.item
+      label="None"
+      name="0"
+      value="0"/>
+    <combo_box.item
+      label="Manual only"
+      name="1"
+      value="1"/>
+    <combo_box.item
+      label="Manual + terrain and water"
+      name="2"
+      value="2"/>
+    <combo_box.item
+      label="Full scene"
+      name="3"
+      value="3"/>
+  </combo_box>
+
+  <slider
     control_name="RenderExposure"
     decimal_digits="1"
     follows="left|top"
-- 
cgit v1.2.3


From 1846791e8afbb27cc612ff4ec8853307e701cdcc Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 20 Apr 2023 00:13:07 +0300
Subject: SL-19614 Make 'ambiance' slider's digits match invement

Value gets rounded towards closest increment, no point displaying smaller values
---
 indra/newview/skins/default/xui/en/floater_adjust_environment.xml | 2 +-
 indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default')

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 f6bfb3574d..ca5c7fe264 100644
--- a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
+++ b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
@@ -258,7 +258,7 @@
                           left_delta="-5"
                           top_pad="15"
                           width="180">Reflection Probe Ambiance:</text>
-                  <slider decimal_digits="3"
+                  <slider decimal_digits="2"
                           follows="left|top"
                           height="16"
                           increment="0.01"
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 a80b1a9166..622c999254 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
@@ -325,7 +325,7 @@
                     Reflection Probe Ambiance:
                   </text>
                   <slider
-                          decimal_digits="3"
+                          decimal_digits="2"
                           follows="left|top"
                           height="16"
                           increment="0.01"
-- 
cgit v1.2.3


From 5c903d9c953e422a95ccd88b345d803b60ce65ff Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Fri, 21 Apr 2023 11:19:14 -0500
Subject: DRTVWR-559 Don't use automatic probes on water (fixes lots of visual
 artifacts)

---
 .../skins/default/xui/en/floater_preferences_graphics_advanced.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

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 d867123c4b..22e889a99c 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
@@ -729,7 +729,7 @@
       name="1"
       value="1"/>
     <combo_box.item
-      label="Manual + terrain and water"
+      label="Manual + terrain"
       name="2"
       value="2"/>
     <combo_box.item
-- 
cgit v1.2.3


From 88adfdcee4941dbc57725c8251c3435fbca1792e Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Wed, 26 Apr 2023 20:47:04 -0500
Subject: DRTVWR-559 Add "No Post" mode and refactor "Scene Gamma" into
 "Brightness" for adjusting legacy gamma when probe ambiance is 0 and dynamic
 exposure when probe ambiance is not zero.

---
 .../default/xui/en/floater_adjust_environment.xml  |  2 +-
 indra/newview/skins/default/xui/en/menu_viewer.xml | 33 ++++++++++++++--------
 .../default/xui/en/panel_settings_sky_atmos.xml    |  2 +-
 3 files changed, 24 insertions(+), 13 deletions(-)

(limited to 'indra/newview/skins/default')

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 ca5c7fe264..aef923feb2 100644
--- a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
+++ b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
@@ -239,7 +239,7 @@
                           layout="topleft"
                           left_delta="-5"
                           top_pad="15"
-                          width="80">Scene Gamma:</text>
+                          width="80">Brightness:</text>
                     <slider decimal_digits="2"
                             follows="left|top"
                             height="16"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 4a92bdc601..3e07daa91b 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1492,7 +1492,28 @@ function="World.EnvPreset"
                      function="ToggleControl"
                      parameter="ShowSelectionBeam" />
                 </menu_item_check>
-
+                <menu_item_check
+                       label="Highlight Transparent"
+                       name="Highlight Transparent"
+                       shortcut="control|alt|T"
+                       use_mac_ctrl="true">
+                  <menu_item_check.on_check
+                   function="View.CheckHighlightTransparent" />
+                  <menu_item_check.on_click
+                   function="View.HighlightTransparent" />
+                </menu_item_check>
+        <menu_item_separator/>
+          
+          <menu_item_check
+            label="No Post"
+            name="No Post">
+            <menu_item_check.on_check
+             control="RenderDisablePostProcessing" />
+            <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="RenderDisablePostProcessing" />
+          </menu_item_check>
+          
         <menu_item_separator/>
 
                 <menu_item_check
@@ -1901,16 +1922,6 @@ function="World.EnvPreset"
                  function="ToggleControl"
                  parameter="HideSelectedObjects" />
             </menu_item_check>
-            <menu_item_check
-             label="Highlight Transparent"
-             name="Highlight Transparent"
-             shortcut="control|alt|T"
-             use_mac_ctrl="true">
-                <menu_item_check.on_check
-                 function="View.CheckHighlightTransparent" />
-                <menu_item_check.on_click
-                 function="View.HighlightTransparent" />
-            </menu_item_check>
             <menu_item_check
              label="Show Mouselook Crosshairs"
              name="ShowCrosshairs">
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 622c999254..e90e6caf84 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
@@ -223,7 +223,7 @@
                             left_delta="-5"
                             top_delta="25"
                             width="80">
-                        Scene Gamma:
+                        Brightness:
                     </text>
                     <slider
                             decimal_digits="2"
-- 
cgit v1.2.3


From 01565d122a371820f4287dec3b1a52a5f4d342ea Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Fri, 28 Apr 2023 13:06:06 -0500
Subject: DRTVWR-559 Touch up performance floater graphics preferences to
 remove preferences that no longer exist.

---
 .../xui/en/panel_performance_preferences.xml       | 79 ++--------------------
 1 file changed, 4 insertions(+), 75 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
index b52c19d5e3..83db17b679 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
@@ -273,7 +273,7 @@
    left="20"
    name="environment_lbl"
    width="100">
-    Environment
+    Shadows
   </text>
   <text
    follows="left|top"
@@ -285,29 +285,8 @@
    left="160"
    name="enhancements_desc"
    width="350">
-    Each enhancement improves realism but can reduce speed.
+    Shadows significantly improve visual quality but can reduce speed.
   </text>
-  <check_box
-    control_name="WindLightUseAtmosShaders"
-    height="16"
-    initial_value="true"
-    label="Atmospheric shaders"
-    layout="topleft"
-    name="atmospheric_shaders"
-    top_pad="5"
-    left="157"
-    width="280">
-  </check_box>
-  <check_box
-    control_name="RenderDeferred"
-    height="16"
-    initial_value="true"
-    label="Advanced Lighting"
-    layout="topleft"
-    name="advanced_lighting_model"
-    top_delta="24"
-    width="280">
-  </check_box>  
   <text
     type="string"
     length="1"
@@ -319,7 +298,7 @@
     text_readonly_color="LabelDisabledColor"
     top_pad="10"
     width="128">
-    Shadows:
+    Shadow Detail:
   </text>
   <combo_box
    control_name="RenderShadowDetail"
@@ -372,7 +351,7 @@
    left="160"
    name="water_desc"
    width="380">
-    Reducing or turning off water effects can greatly improve frame rate.
+    Reducing or turning off transparent water may improve frame rate.
   </text>
   <check_box
     control_name="RenderTransparentWater"
@@ -385,56 +364,6 @@
     left="157"
     width="280">
   </check_box>
-  <text
-    type="string"
-    length="1"
-    follows="left|top"
-    height="16"
-    layout="topleft"
-    name="ReflectionsText"
-    text_readonly_color="LabelDisabledColor"
-    top_pad="16"
-    left="160"
-    width="128">
-    Water Reflections:
-  </text>
-  <combo_box
-    control_name="RenderReflectionDetail"
-    height="18"
-    layout="topleft"
-    left_delta="150"
-    top_delta="0"
-    name="Reflections"
-    width="150">
-    <combo_box.item
-      label="None; opaque"
-      name="0"
-      value="-2"/>
-    <combo_box.item
-      label="None; transparent"
-      name="0"
-      value="-1"/>
-    <combo_box.item
-      label="Minimal"
-      name="0"
-      value="0"/>
-    <combo_box.item
-      label="Terrain and trees"
-      name="1"
-      value="1"/>
-    <combo_box.item
-      label="All static objects"
-      name="2"
-      value="2"/>
-    <combo_box.item
-      label="All avatars and objects"
-      name="3"
-      value="3"/>
-    <combo_box.item
-      label="Everything"
-      name="4"
-      value="4"/>
-  </combo_box>
   <view_border
     bevel_style="in"
     height="0"
-- 
cgit v1.2.3


From c827d32ebedeaa46ed75a91ae779f6547fc0d090 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Wed, 17 May 2023 18:09:36 -0500
Subject: SL-19655 Decruft legacy GLSL shaders and now unused build queues.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index df067d2b88..3164c3e124 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2923,16 +2923,6 @@ function="World.EnvPreset"
            function="Advanced.ToggleInfoDisplay"
            parameter="triangle count" />
         </menu_item_check>
-        <menu_item_check
-         label="Build Queue"
-         name="Build Queue">
-          <menu_item_check.on_check
-           function="Advanced.CheckInfoDisplay"
-           parameter="build queue" />
-          <menu_item_check.on_click
-           function="Advanced.ToggleInfoDisplay"
-           parameter="build queue" />
-        </menu_item_check>
         <menu_item_check
          label="Lights"
          name="Lights">
-- 
cgit v1.2.3


From 87bda552688bb38fe255cc7e6069c1be6ac20834 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Wed, 17 May 2023 19:30:27 -0400
Subject: Add a binary cache for compiled shaders using glProgramBinary (#216)

* Add a binary cache for compiled shaders using glProgramBinary

* Add additional sanity checking to shader binary save and load, hook up cache clear and menu option

* Fix default init of shader cache data struct and clear gl errors before glGetError calls

---------

Co-authored-by: RunitaiLinden <davep@lindenlab.com>
---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 3164c3e124..7a29d68a4c 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3259,7 +3259,24 @@ function="World.EnvPreset"
                  parameter="RenderAttachedParticles" />
             </menu_item_check>
           <menu_item_separator />
-          
+          <menu_item_check
+             label="Enable Shader Cache"
+             name="Enable Shader Cache">
+            <menu_item_check.on_check
+             function="CheckControl"
+             parameter="RenderShaderCacheEnabled" />
+            <menu_item_check.on_click
+             function="ToggleShaderControl"
+             parameter="RenderShaderCacheEnabled" />
+          </menu_item_check>
+          <menu_item_call
+            enabled="true"
+            label="Clear Shader Cache"
+            name="Shader Cache Clear">
+            <menu_item_call.on_click
+             function="Advanced.ClearShaderCache" />
+          </menu_item_call>
+          <menu_item_separator />
           <menu_item_call
             enabled="true"
             label="Clear Cache Immediately"
-- 
cgit v1.2.3


From fa2c2a516c821dc2abb4f2c73bbb34c430ae0d92 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 23 May 2023 20:44:31 +0300
Subject: SL-19753 PBR Some changes to the right-click menu

---
 .../skins/default/xui/en/menu_attachment_self.xml  | 10 +-----
 indra/newview/skins/default/xui/en/menu_object.xml | 41 +++++++---------------
 2 files changed, 14 insertions(+), 37 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
index 630a1981df..943bfb8122 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -13,21 +13,13 @@
          function="EnableEdit" />
     </menu_item_call>
     <menu_item_call
-     label="Edit PBR Material"
+     label="Edit PBR material"
      name="EditGLTFMaterial">
         <menu_item_call.on_click
          function="Object.EditGLTFMaterial" />
         <menu_item_call.on_enable
          function="Object.EnableEditGLTFMaterial"/>
     </menu_item_call>
-    <menu_item_call
-     label="Save material to inventory"
-     name="SaveGLTFMaterial">
-        <menu_item_call.on_click
-         function="Object.SaveGLTFMaterial" />
-        <menu_item_call.on_enable
-         function="Object.EnableSaveGLTFMaterial"/>
-    </menu_item_call>
     <menu_item_call
      enabled="false"
      label="Detach item"
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index 6d37c15815..c4fa073999 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -22,29 +22,13 @@
         function="EnableEdit"/>
   </menu_item_call>
   <menu_item_call
-      label="Edit PBR Material"
+      label="Edit PBR material"
       name="EditGLTFMaterial">
     <menu_item_call.on_click
         function="Object.EditGLTFMaterial" />
-    <menu_item_call.on_enable
+    <menu_item_call.on_visible
         function="Object.EnableEditGLTFMaterial"/>
   </menu_item_call>
-  <menu_item_call
-      label="Save material to inventory"
-      name="SaveGLTFMaterial">
-    <menu_item_call.on_click
-        function="Object.SaveGLTFMaterial" />
-    <menu_item_call.on_enable
-        function="Object.EnableSaveGLTFMaterial"/>
-  </menu_item_call>
-  <menu_item_call
-      label="Build"
-      name="Build">
-    <menu_item_call.on_click
-        function="Object.Build" />
-    <menu_item_call.on_enable
-        function="EnableEdit"/>
-  </menu_item_call>
   <menu_item_call
       enabled="false"
       label="Open"
@@ -54,26 +38,27 @@
     <menu_item_call.on_enable
         function="Object.EnableOpen" />
   </menu_item_call>
+  <menu_item_separator layout="topleft" />
   <menu_item_call
       enabled="false"
-      label="Sit Here"
+      label="Sit here"
       name="Object Sit">
     <menu_item_call.on_click
         function="Object.SitOrStand" />
-    <menu_item_call.on_enable
+    <menu_item_call.on_visible
         function="Object.EnableSit" />
   </menu_item_call>
   <menu_item_call
       enabled="false"
-      label="Stand Up"
+      label="Stand up"
       name="Object Stand Up">
     <menu_item_call.on_click
         function="Object.SitOrStand" />
-    <menu_item_call.on_enable
+    <menu_item_call.on_visible
         function="Object.EnableStandUp" />
   </menu_item_call>
   <menu_item_call
-      label="Object Profile"
+      label="Object profile"
       name="Object Inspect">
     <menu_item_call.on_click
         function="Object.Inspect" />
@@ -81,13 +66,13 @@
         function="Object.EnableInspect" />
   </menu_item_call>
   <menu_item_call
-      label="Zoom In"
+      label="Zoom in"
       name="Zoom In">
     <menu_item_call.on_click
         function="Object.ZoomIn" />
   </menu_item_call>
   <menu_item_call
-      label="Show in linksets"
+      label="Show in Region Objects"
       name="show_in_linksets">
     <menu_item_call.on_click
         function="Pathfinding.Linksets.Select" />
@@ -108,7 +93,7 @@
   </menu_item_call>
   <menu_item_separator layout="topleft" />
   <context_menu
-      label="Put On"
+      label="Put on"
       name="Put On" >
     <menu_item_call
         enabled="false"
@@ -185,7 +170,7 @@
   </menu_item_call>
   <menu_item_call
       enabled="false"
-      label="Take Copy"
+      label="Take copy"
       name="Take Copy">
     <menu_item_call.on_click
         function="Tools.TakeCopy" />
@@ -223,7 +208,7 @@
        layout="topleft" />
   <menu_item_call
      enabled="false"
-     label="Block Particle Owner"
+     label="Block particle owner"
      name="Mute Particle">
     <menu_item_call.on_click
      function="Particle.Mute" />
-- 
cgit v1.2.3


From a9746a36a6121e4b585bc23757f7977045d68749 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 23 May 2023 20:47:12 +0300
Subject: SL-19757 Restore word "Materials" to editor's menu

---
 indra/newview/skins/default/xui/en/panel_tools_texture.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 67bdd189c1..e3055af623 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -140,7 +140,7 @@
              top_pad="17"
              width="90">
                 <combo_box.item
-                 label="Blinn-Phong"
+                 label="Materials"
                  name="Materials"
                  value="Materials" />
                 <combo_box.item
-- 
cgit v1.2.3


From 204cc30e6382e6b779dc2183c41fd8392c1a9e6d Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 23 May 2023 21:43:32 +0300
Subject: SL-19754 Expose the new exposure setting in basic Preferences

---
 .../default/xui/en/panel_preferences_graphics1.xml    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'indra/newview/skins/default')

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 74a44b6b09..fe74cea2f1 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -315,6 +315,25 @@ width="120">
       function="Pref.RenderExceptions"/>
   </button>
 
+  <slider
+    control_name="RenderExposure"
+    decimal_digits="1"
+    follows="left|top"
+    height="16"
+    increment="0.1"
+    initial_value="160"
+    label="Brightness (exposure)"
+    label_width="145"
+    layout="topleft"
+    left="30"
+    min_val="0.5"
+    max_val="1.5"
+    name="RenderExposure"
+    show_text="true"
+    top_pad="14"
+    width="260">
+  </slider>
+
 <!-- End of Basic Settings block -->
 
   <button
-- 
cgit v1.2.3


From 30a3f8b64aa4df01c8e59bbd0f5799704761fd67 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 24 May 2023 20:34:14 +0300
Subject: SL-19767 Fix sit&stand being disabled by default

---
 indra/newview/skins/default/xui/en/menu_object.xml | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index c4fa073999..8264d487c9 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -40,7 +40,6 @@
   </menu_item_call>
   <menu_item_separator layout="topleft" />
   <menu_item_call
-      enabled="false"
       label="Sit here"
       name="Object Sit">
     <menu_item_call.on_click
@@ -49,7 +48,6 @@
         function="Object.EnableSit" />
   </menu_item_call>
   <menu_item_call
-      enabled="false"
       label="Stand up"
       name="Object Stand Up">
     <menu_item_call.on_click
-- 
cgit v1.2.3


From 963ca3a0d5c40f4af2fa681f8ff6d4a97bb7b47c Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 24 May 2023 23:04:28 +0300
Subject: SL-19757 Restore word "Materials" to editor's menu #2

---
 .../skins/default/xui/en/panel_tools_texture.xml       | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index e3055af623..51e6099ceb 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -132,15 +132,27 @@
              name="object_horizontal"
              top_pad="4"
              width="278" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left="12"
+             top_pad="12"
+             name="label_matmedia"
+             width="90">
+                Material
+            </text>
             <combo_box
              height="23"
              layout="topleft"
              left="10"
              name="combobox matmedia"
-             top_pad="17"
+             top_pad="5"
              width="90">
                 <combo_box.item
-                 label="Materials"
+                 label="Blinn-Phong"
                  name="Materials"
                  value="Materials" />
                 <combo_box.item
@@ -156,7 +168,7 @@
             height="84"
             layout="topleft"
             left_pad="5"
-            top_delta="-10"
+            top_delta="-20"
             width="150"
             visible = "false"
             name="radio_material_type">
-- 
cgit v1.2.3


From 2e2a821e3667cbedc57086121b834c339a3c68de Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 26 May 2023 20:07:22 +0300
Subject: SL-19753 PBR Re-add Build option Rev#3

---
 indra/newview/skins/default/xui/en/menu_object.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index 8264d487c9..5507c9f3a1 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -29,6 +29,14 @@
     <menu_item_call.on_visible
         function="Object.EnableEditGLTFMaterial"/>
   </menu_item_call>
+  <menu_item_call
+      label="Build"
+      name="Build">
+    <menu_item_call.on_click
+        function="Object.Build" />
+    <menu_item_call.on_enable
+        function="EnableEdit"/>
+  </menu_item_call>
   <menu_item_call
       enabled="false"
       label="Open"
-- 
cgit v1.2.3


From 50ec54831de88926ca13c9a72d89006ceda6c355 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Thu, 1 Jun 2023 19:49:23 -0500
Subject: DRTVWR-559 Revert skies to be very close to release and disable tone
 mapping when probe ambiance is zero.

Hack for desaturating legacy materials has been removed for performance and quality reasons.

Adds a new setting for auto adjusting legacy skies.  This is the PBR "opt out" button.  If disabled, legacy skies will disable tonemapping, automatic probe ambiance, and HDR/exposure.  If enabled, legacy skies will behave as if probe ambiance and HDR scale are 1.0, and ambient will be cut in half.

HDR scale will act as a sky brightener, but will automatically adjust dynamic exposure so the sky will be properly exposed.  If you want relatively even exposure all the time, set HDR Scale to 1.0.  If you want a high range of exposures between indoor/dark areas and outdoor/bright areas, increase HDR Scale.

Also tuned up SSAO (thanks Rye!).

Reviewed with Brad.
---
 .../default/xui/en/floater_adjust_environment.xml  | 40 +++++++++--------
 .../en/floater_preferences_graphics_advanced.xml   | 14 ++++++
 .../default/xui/en/panel_settings_sky_atmos.xml    | 51 ++++++++++++----------
 3 files changed, 62 insertions(+), 43 deletions(-)

(limited to 'indra/newview/skins/default')

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 5258bdbaf2..518a83f846 100644
--- a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
+++ b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
@@ -10,6 +10,8 @@
          min_height="275"
          single_instance="true"
          can_resize="false">
+  <string name="hdr_string">HDR Scale:</string>
+  <string name="brightness_string">Brightness:</string>
     <layout_stack name="outer_stack"
                   width="845"
                   height="275"
@@ -245,25 +247,6 @@
                             top_pad="5"
                             width="185"
                             can_edit_text="true"/>
-                    <text follows="left|top"
-                          name="scene_gamma_label"
-                          height="10"
-                          layout="topleft"
-                          left_delta="-5"
-                          top_pad="15"
-                          width="80">Brightness:</text>
-                    <slider decimal_digits="2"
-                            follows="left|top"
-                            height="16"
-                            increment="0.01"
-                            initial_value="0"
-                            layout="topleft"
-                            left_delta="5"
-                            max_val="20"
-                            name="scene_gamma"
-                            top_pad="5"
-                            width="185"
-                            can_edit_text="true"/>
                   <text follows="left|top"
                           height="10"
                           layout="topleft"
@@ -283,6 +266,25 @@
                           top_pad="5"
                           width="185"
                           can_edit_text="true"/>
+                    <text follows="left|top"
+                          name="scene_gamma_label"
+                          height="10"
+                          layout="topleft"
+                          left_delta="-5"
+                          top_pad="15"
+                          width="80">Brightness:</text>
+                    <slider decimal_digits="2"
+                            follows="left|top"
+                            height="16"
+                            increment="0.01"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            max_val="20"
+                            name="scene_gamma"
+                            top_pad="5"
+                            width="185"
+                            can_edit_text="true"/>
                 </layout_panel>
                 <layout_panel border="false"
                               name="lp_3"
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 fd80673903..c1a94a2128 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
@@ -600,6 +600,20 @@
       function="Pref.RenderOptionUpdate" />
   </check_box>
 
+  <check_box
+  control_name="RenderSkyAutoAdjustLegacy"
+  height="16"
+  initial_value="true"
+  label="Auto-adjust Legacy Sky"
+  layout="topleft"
+  left="420"
+  name="AutoAdjustLegacySky"
+  top_delta="16"
+  width="240">
+    <check_box.commit_callback
+      function="Pref.RenderOptionUpdate" />
+  </check_box>
+
   <check_box
     control_name="RenderDepthOfField"
     height="16"
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 58d125a88e..36a485e498 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
@@ -7,6 +7,8 @@
         left="0"
         name="panel_settings_sky_atmos"
         top="0">
+  <string name="hdr_string">HDR Scale:</string>
+  <string name="brightness_string">Brightness:</string>
     <layout_stack
             name="main_ls"
             follows="all"
@@ -228,29 +230,6 @@
                             name="ice_level"
                             width="207"
                             can_edit_text="true"/>
-                    <text
-                            name="scene_gamma_label"
-                            follows="left|top"
-                            height="10"
-                            layout="topleft"
-                            left_delta="-5"
-                            top_delta="25"
-                            width="80">
-                        Brightness:
-                    </text>
-                    <slider
-                            decimal_digits="2"
-                            follows="left|top"
-                            height="16"
-                            increment="0.01"
-                            initial_value="0"
-                            layout="topleft"
-                            left_delta="5"
-                            max_val="20"
-                            name="scene_gamma"
-                            top_delta="20"
-                            width="207"
-                            can_edit_text="true"/>
                 </layout_panel>            
                 <layout_panel
                         name="right_lp"
@@ -338,8 +317,9 @@
                             layout="topleft"
                             left_delta="-5"
                             top_delta="25"
+                            tooltip="Irradiance control.  When not zero, enables HDR lighting model."
                             width="200">
-                    Reflection Probe Ambiance:
+                    Reflection Probe Ambiance (HDR):
                   </text>
                   <slider
                           decimal_digits="2"
@@ -355,6 +335,29 @@
                           top_delta="20"
                           width="219"
                           can_edit_text="true"/>
+                  <text
+                            name="scene_gamma_label"
+                            follows="left|top"
+                            height="10"
+                            layout="topleft"
+                            left_delta="-5"
+                            top_delta="25"
+                            width="80">
+                    Brightness:
+                  </text>
+                  <slider
+                          decimal_digits="2"
+                          follows="left|top"
+                          height="16"
+                          increment="0.01"
+                          initial_value="0"
+                          layout="topleft"
+                          left_delta="5"
+                          max_val="20"
+                          name="scene_gamma"
+                          top_delta="20"
+                          width="207"
+                          can_edit_text="true"/>
                 </layout_panel>            
             </layout_stack>                
         </layout_panel>
-- 
cgit v1.2.3


From c96a00f12f868b9260f517a6a8552bce0b564099 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Mon, 12 Jun 2023 10:08:27 -0500
Subject: SL-19856 Adjust water fog density range.  Incidental decruft.

---
 indra/newview/skins/default/xui/en/panel_settings_water.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index 1aa42af3a8..f19629df26 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -72,8 +72,8 @@
                     initial_value="0"
                     layout="top"
                     left_delta="15"
-                    min_val="-10"
-                    max_val="10"
+                    min_val="0.001"
+                    max_val="100"
                     name="water_fog_density"
                     top_delta="5"
                     width="150"
-- 
cgit v1.2.3


From b132e2eea87b7c58a92057244ab681d3466cbafe Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Thu, 15 Jun 2023 16:55:18 -0500
Subject: SL-19878 Remove auto-adjust legacy skies checkbox.

---
 .../xui/en/floater_preferences_graphics_advanced.xml       | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'indra/newview/skins/default')

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 c1a94a2128..fd80673903 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
@@ -600,20 +600,6 @@
       function="Pref.RenderOptionUpdate" />
   </check_box>
 
-  <check_box
-  control_name="RenderSkyAutoAdjustLegacy"
-  height="16"
-  initial_value="true"
-  label="Auto-adjust Legacy Sky"
-  layout="topleft"
-  left="420"
-  name="AutoAdjustLegacySky"
-  top_delta="16"
-  width="240">
-    <check_box.commit_callback
-      function="Pref.RenderOptionUpdate" />
-  </check_box>
-
   <check_box
     control_name="RenderDepthOfField"
     height="16"
-- 
cgit v1.2.3


From 3a1b60b2baa80218a79bf33cf983bd28df4f2343 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Thu, 22 Jun 2023 17:10:24 -0500
Subject: SL-19785 Fix for blown out skies from Glow Focus.  Add notification
 when editing legacy skies.

---
 indra/newview/skins/default/xui/en/notifications.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 4949075f2d..f77b235408 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -12097,5 +12097,17 @@ Material successfully created.  Asset ID: [ASSET_ID]
        notext="Cancel"
        yestext="OK"/>
   </notification>
+
+  <notification
+    icon="notifytip.tga"
+    name="AutoAdjustHDRSky"
+    persist="true"
+    type="alertmodal">
+      You are editing a non-HDR sky that has been automatically converted to HDR.  To remove HDR and tone mapping, set Reflection Probe Ambiance to zero.
+    <usetemplate
+        ignoretext="HDR Sky adjustment warning"
+        name="okignore"
+        yestext="OK"/>
+  </notification>
   
 </notifications>
-- 
cgit v1.2.3


From ba4b596894e8eb9b9eb51169b9b3f88c21173c29 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 11 Jul 2023 01:24:22 +0300
Subject: SL-19141 Fixed applying a no-copy texture to two objects failing
 silently

---
 indra/newview/skins/default/xui/en/notifications.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f77b235408..c4abd27a01 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9211,6 +9211,26 @@ Paste failed. [REASON]
     yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="FailedToApplyTextureNoCopyToMultiple"
+   type="alertmodal">
+Failed to apply texture. You can not apply a no-copy texture to multiple objects.
+   <usetemplate
+    name="okbutton"
+    yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="FailedToApplyGLTFNoCopyToMultiple"
+   type="alertmodal">
+Failed to apply GLTF material. You can not apply a no-copy material to multiple objects.
+   <usetemplate
+    name="okbutton"
+    yestext="OK"/>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="FacePasteTexturePermissions"
-- 
cgit v1.2.3


From df1eb38b2109bf9cb57b42e2c361c4143276ae5a Mon Sep 17 00:00:00 2001
From: Brad Linden <brad@lindenlab.com>
Date: Thu, 13 Jul 2023 10:08:19 -0700
Subject: SL-19999 stop outputing debug info about created material asset id
 unnecessarily

---
 indra/newview/skins/default/xui/en/notifications.xml | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c4abd27a01..3d151a9868 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -12098,13 +12098,6 @@ Would you like to save them first?
        yestext="Yes"/>
   </notification>
     
-<notification
- icon="notifytip.tga"
- name="MaterialCreated"
- type="notifytip">
-Material successfully created.  Asset ID: [ASSET_ID]
-</notification>
-
   <notification
     icon="notifytip.tga"
     name="ReflectionProbeApplied"
-- 
cgit v1.2.3


From bb5e40a1fdc35b3a41925f91684bc76854338cfb Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Tue, 18 Jul 2023 12:23:03 -0500
Subject: SL-19953 Change label of alpha value in GLTF material editor to
 "Alpha"

---
 indra/newview/skins/default/xui/en/panel_gltf_material.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_gltf_material.xml b/indra/newview/skins/default/xui/en/panel_gltf_material.xml
index 6975525b3d..45df40bc05 100644
--- a/indra/newview/skins/default/xui/en/panel_gltf_material.xml
+++ b/indra/newview/skins/default/xui/en/panel_gltf_material.xml
@@ -98,7 +98,7 @@
       top_pad="5"
       width="96"
       name="base_color_transparency_lbl">
-      Transparency
+      Alpha
     </text>
     <spinner
       decimal_digits="3"
-- 
cgit v1.2.3


From f1f8253689c65adcd8e7dc939b478bb82b8975ec Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 20 Jul 2023 17:46:59 +0300
Subject: SL-20042 remove extra space from the message text

---
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index d3a31f16ec..af0bda16d0 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -12124,7 +12124,7 @@ Would you like to save them first?
     name="AutoAdjustHDRSky"
     persist="true"
     type="alertmodal">
-      You are editing a non-HDR sky that has been automatically converted to HDR.  To remove HDR and tone mapping, set Reflection Probe Ambiance to zero.
+      You are editing a non-HDR sky that has been automatically converted to HDR. To remove HDR and tone mapping, set Reflection Probe Ambiance to zero.
     <usetemplate
         ignoretext="HDR Sky adjustment warning"
         name="okignore"
-- 
cgit v1.2.3


From 864a15f9957fa7624a9b8685baaa4ed5a7e73be7 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 20 Jul 2023 20:47:58 +0300
Subject: SL-20043 notification shouldn't persist between sessions

---
 indra/newview/skins/default/xui/en/notifications.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index af0bda16d0..ca07aacb21 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -12122,7 +12122,6 @@ Would you like to save them first?
   <notification
     icon="notifytip.tga"
     name="AutoAdjustHDRSky"
-    persist="true"
     type="alertmodal">
       You are editing a non-HDR sky that has been automatically converted to HDR. To remove HDR and tone mapping, set Reflection Probe Ambiance to zero.
     <usetemplate
-- 
cgit v1.2.3


From ec1d1f43540bac02e6cd2e814ee14da0cd33a67c Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Fri, 28 Jul 2023 19:15:28 -0500
Subject: SL-20094 Add "Select Reflection Probes" checkbox

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 7a29d68a4c..bb19ae2b98 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1445,6 +1445,15 @@ function="World.EnvPreset"
                     <menu_item_check.on_click
                      function="Tools.SelectInvisibleObjects"
                      parameter="invisible" />
+            </menu_item_check>
+            <menu_item_check
+                 label="Select Reflection Probes"
+                 name="Select Reflection Probes">
+                    <menu_item_check.on_check
+                     control="SelectReflectionProbes" />
+                    <menu_item_check.on_click
+                     function="Tools.SelectReflectionProbes"
+                     parameter="reflection_probes" />
             </menu_item_check>
                 <menu_item_check
                  label="Select By Surrounding"
-- 
cgit v1.2.3


From 706448f549edd82620b8f0bd37ea75ff832fa615 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 4 Aug 2023 12:38:25 +0300
Subject: SL-20105 Add materials asset to 'Adjust Content Permissions' floater

---
 indra/newview/skins/default/xui/en/floater_bulk_perms.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
index 431c33a339..7aa31bed71 100644
--- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
@@ -170,6 +170,20 @@
     name="icon_setting"
     tool_tip="Environment settings"
     left_pad="2" />
+  <check_box
+    control_name="BulkChangeIncludeMaterials"
+    height="16"
+    name="check_materials"
+    top_pad="5"
+    left="245"
+    width="16" />
+  <icon
+    height="16"
+    image_name="Inv_Material"
+    mouse_opaque="true"
+    name="icon_materials"
+    tool_tip="Materials"
+    left_pad="2" />
     <button
       height="23"
     layout="topleft"
-- 
cgit v1.2.3


From a4030031f895f8497e106f0547eb29780d6ec4e9 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Fri, 21 Jul 2023 17:28:09 -0700
Subject: SL-20024: Do not show material preview for no-modify materials

---
 indra/newview/skins/default/xui/en/notifications.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ca07aacb21..bbc3798034 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9209,6 +9209,18 @@ We cannot display a preview of this texture because it is no-copy and/or no-tran
     yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="LivePreviewUnavailablePBR"
+   type="alert">
+   
+We cannot display a preview of this material because it is no-copy, no-transfer, and/or no-modify.
+  <usetemplate
+    ignoretext="Warn me that Live Preview mode is not available for no-copy, no-transfer, and/or no-modify materials"
+    name="okignore"
+    yestext="OK"/>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="FacePasteFailed"
-- 
cgit v1.2.3


From 6c8ced0edd9e2b86914e3e316ba65ae9492d3e6f Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Tue, 1 Aug 2023 12:36:49 -0700
Subject: SL-20024: Show loading message when inventory permissions are loading

---
 .../newview/skins/default/xui/en/panel_tools_texture.xml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 51e6099ceb..5b15752eb7 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -284,12 +284,26 @@
              name="pbr_from_inventory"
              label="Choose from inventory"
              width="140"/>
+            <text
+             visible="false"
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             top_pad="4"
+             left_delta="0"
+             name="material_permissions_loading_label"
+             text_readonly_color="LabelDisabledColor"
+             width="160">
+                Loading contents...
+            </text>
             <button
              follows="left|top"
              height="23"
              layout="topleft"
              left_delta="0"
-             top_pad="4"
+             top_delta="0"
              name="edit_selected_pbr"
              label="Edit Selected"
              width="140"/>
-- 
cgit v1.2.3


From 0b85c05f8eefc79315c5695531335ec76a7504d2 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 29 Jun 2023 23:53:22 +0300
Subject: SL-20145 New inventory feature notification

Pulled in relevant parts from SL-19929
---
 .../xui/en/floater_new_feature_notification.xml    | 60 ++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_new_feature_notification.xml

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml b/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
new file mode 100644
index 0000000000..5f0eeab71c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ height="130"
+ width="300"
+ layout="topleft"
+ name="floater_new_feature_notification"
+ title="NEW FEATURE"
+ show_title="false"
+ header_height="0"
+ bg_opaque_image="Window_NoTitle_Foreground"
+ bg_alpha_image="Window_NoTitle_Background"
+ can_resize="false"
+ can_drag_on_left="false"
+ can_minimize="false"
+ can_close="false">
+    <floater.string name="title_txt_inventory">
+New inventory features
+    </floater.string>
+    <floater.string name="description_txt_inventory">
+You can now add preview images to inventory items and view a folder in its own window.
+Learn more in this [https://community.secondlife.com/blogs/entry/13637-new-features-inventory-item-preview-and-single-folder-view/ blogpost]
+    </floater.string>
+  <text
+   type="string"
+   length="1"
+   follows="top|left|right"
+   font="SansSerifLargeBold"
+   text_color="White"
+   layout="topleft"
+   left="10"
+   height="14"
+   top="10"
+   right="-10"
+   name="title_txt">
+New feature
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="top|left|right"
+   text_color="White"
+   layout="topleft"
+   left="10"
+   height="40"
+   top_pad="14"
+   right="-10"
+   word_wrap="true"
+   name="description_txt">
+Feature description
+  </text>
+  <button
+   follows="bottom|left|right"
+   layout="topleft"
+   height="24"
+   label="Got it!"
+   left="104"
+   bottom="-10"
+   name="close_btn"
+   width="90"/>
+</floater>
-- 
cgit v1.2.3


From ef33902f220df35727ba54ee8bc3ed02bc53d6be Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 18 Aug 2023 19:59:14 +0300
Subject: SL-20145 GLTF specific feature notification

---
 .../skins/default/xui/en/floater_new_feature_notification.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml b/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
index 5f0eeab71c..c8726d36b4 100644
--- a/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
+++ b/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
@@ -20,6 +20,15 @@ New inventory features
 You can now add preview images to inventory items and view a folder in its own window.
 Learn more in this [https://community.secondlife.com/blogs/entry/13637-new-features-inventory-item-preview-and-single-folder-view/ blogpost]
     </floater.string>
+    <floater.string name="title_txt_gltf">
+New GLTF PBR materials support
+    </floater.string>
+    <floater.string name="description_txt_gltf">
+You can now use expanded material support with the ability to import and edit GLTF Physically Based Rendering (PBR) Materials.
+In order to support the addition of the GLTF format, some areas in the viewer may appear darker than usual.
+
+Learn more about [https://wiki.secondlife.com/wiki/PBR_Materials Physically Based Rendering (PBR)]
+    </floater.string>
   <text
    type="string"
    length="1"
@@ -37,7 +46,7 @@ New feature
   <text
    type="string"
    length="1"
-   follows="top|left|right"
+   follows="top|left|right|bottom"
    text_color="White"
    layout="topleft"
    left="10"
-- 
cgit v1.2.3


From 89f2165b4170d9fddc10a55292c28750093a22a0 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 25 Aug 2023 22:14:29 +0200
Subject: SL-20197 Remove 'Edit PBR material' from context menu when editing an
 attachment

---
 indra/newview/skins/default/xui/en/menu_attachment_self.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
index 943bfb8122..8e041f8de3 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -17,7 +17,7 @@
      name="EditGLTFMaterial">
         <menu_item_call.on_click
          function="Object.EditGLTFMaterial" />
-        <menu_item_call.on_enable
+        <menu_item_call.on_visible
          function="Object.EnableEditGLTFMaterial"/>
     </menu_item_call>
     <menu_item_call
-- 
cgit v1.2.3


From a95ad7aac7248c5b81e5d9dd9e606b5ecb61e301 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 28 Sep 2023 23:35:09 +0300
Subject: SL-20337 Add tooltips for HDR Scale and Reflection Probe Ambience
 environment sliders

---
 indra/newview/skins/default/xui/en/floater_adjust_environment.xml | 2 ++
 indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml   | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'indra/newview/skins/default')

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 518a83f846..91a1dffcb5 100644
--- a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
+++ b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
@@ -12,6 +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>
     <layout_stack name="outer_stack"
                   width="845"
                   height="275"
@@ -263,6 +264,7 @@
                           min_val="0"
                           max_val="10"
                           name="probe_ambiance"
+                          tool_tip="Intensity of environment based indirect lighting. At zero HDR scale becomes Brightness"
                           top_pad="5"
                           width="185"
                           can_edit_text="true"/>
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 2d79bc74ab..da82c95c83 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,6 +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>
     <layout_stack
             name="main_ls"
             follows="all"
@@ -332,6 +333,7 @@
                           min_val="0"
                           max_val="10"
                           name="probe_ambiance"
+                          tool_tip="Intensity of environment based indirect lighting. At zero HDR scale becomes Brightness"
                           top_delta="20"
                           width="219"
                           can_edit_text="true"/>
-- 
cgit v1.2.3


From a1a32edf52365415f35cea26b26c011fc4d35984 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Wed, 4 Oct 2023 15:41:44 -0500
Subject: SL-20141 Remove "Local Lights" checkbox and instead make the number
 of lights rendered scale with the "Quality & speed" slider

---
 .../default/xui/en/floater_preferences_graphics_advanced.xml  | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'indra/newview/skins/default')

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 fd80673903..bc237322af 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
@@ -540,17 +540,6 @@
       function="Pref.RenderOptionUpdate" />
   </check_box>
 
-  <check_box
-    control_name="RenderLocalLights"
-    height="16"
-    initial_value="true"
-    label="Local Lights"
-    layout="topleft"
-    left="420"
-    name="LocalLights"
-    top_delta="16"
-    width="300" />
-
   <slider
     control_name="WLSkyDetail"
     decimal_digits="0"
-- 
cgit v1.2.3


From 5431ad7e567c0bbdf5dcf0efbed4c4a59fee3c29 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Wed, 11 Oct 2023 14:57:35 -0500
Subject: SL-20440 Followup -- remove UI for decrufted LOCAL_LIGHT_KILL et al.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 30 ----------------------
 1 file changed, 30 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index e254ae8859..8b39ea192b 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3229,36 +3229,6 @@ function="World.EnvPreset"
                  function="ToggleControl"
                  parameter="TextureDisable" />
             </menu_item_check>
-            <menu_item_check
-              label="Disable Ambient"
-             name="Disable Ambient">
-            <menu_item_check.on_check
-             function="CheckControl"
-             parameter="AmbientDisable" />
-            <menu_item_check.on_click
-             function="ToggleShaderControl"
-             parameter="AmbientDisable" />
-          </menu_item_check>
-          <menu_item_check
-             label="Disable Sunlight"
-             name="Disable Sunlight">
-            <menu_item_check.on_check
-             function="CheckControl"
-             parameter="SunlightDisable" />
-            <menu_item_check.on_click
-             function="ToggleShaderControl"
-             parameter="SunlightDisable" />
-          </menu_item_check>
-          <menu_item_check
-             label="Disable Local Lights"
-             name="Disable Local Lights">
-            <menu_item_check.on_check
-             function="CheckControl"
-             parameter="LocalLightDisable" />
-            <menu_item_check.on_click
-             function="ToggleShaderControl"
-             parameter="LocalLightDisable" />
-          </menu_item_check>
             <menu_item_check
               label="Full Res Textures"
              name="Rull Res Textures">
-- 
cgit v1.2.3


From ea67abf78fad1c924659305296c51b2af99b0793 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 12 Oct 2023 18:12:05 +0300
Subject: SL-20437 Make the "Unable to load material" message a modal
 notification.

---
 indra/newview/skins/default/xui/en/notifications.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 812716ac7f..f2473e98d3 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6978,12 +6978,15 @@ Please try again.
   </notification>
 
   <notification
-   icon="notifytip.tga"
+   icon="alertmodal.tga"
    name="UnableToLoadMaterial"
-   type="notifytip">
-    Unable to load material.
-    Please try again.
+   type="alertmodal">
+Unable to load material.
+Please try again.
     <tag>fail</tag>
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
   </notification>
 
   <notification
-- 
cgit v1.2.3


From 66da7af77c999c099f8b44e59fcace87af8ead30 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 12 Oct 2023 21:05:59 +0300
Subject: SL-20453 Fix dupplicate items in menu

Cleanup. Caused by a merge of main(D567) into D559
---
 .../skins/default/xui/en/menu_inventory.xml        | 287 +--------------------
 1 file changed, 8 insertions(+), 279 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 641078e822..1907dc2438 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -466,285 +466,6 @@
          function="Inventory.DoToSelected"
          parameter="delete_system_folder" />
     </menu_item_call>
-    <menu_item_separator
-     layout="topleft"
-     name="Create Separator" />
-    <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 Outfit"
-     layout="topleft"
-     name="New Outfit">
-      <menu_item_call.on_click
-       function="Inventory.DoCreate"
-       parameter="outfit" />
-    </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
-     label="Use as default for"
-     layout="topleft"
-     name="upload_def">
-      <menu_item_call
-       label="Image uploads"
-       layout="topleft"
-       name="Image uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="texture" />
-      </menu_item_call>
-      <menu_item_call
-       label="Sound uploads"
-       layout="topleft"
-       name="Sound uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="sound" />
-      </menu_item_call>
-      <menu_item_call
-       label="Animation uploads"
-       layout="topleft"
-       name="Animation uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="animation" />
-      </menu_item_call>
-      <menu_item_call
-       label="Model uploads"
-       layout="topleft"
-       name="Model uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="model" />
-      </menu_item_call>
-      <menu_item_call
-       label="PBR material uploads"
-       layout="topleft"
-       name="PBR uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="pbr_material" />
-      </menu_item_call>
-    </menu>
     <menu_item_separator
      layout="topleft" />
     <menu_item_separator
@@ -1030,6 +751,14 @@
      function="Inventory.FileUploadLocation"
      parameter="model" />
     </menu_item_call>
+    <menu_item_call
+     label="PBR material uploads"
+     layout="topleft"
+     name="PBR uploads">
+        <menu_item_call.on_click
+         function="Inventory.FileUploadLocation"
+         parameter="pbr_material" />
+    </menu_item_call>
   </menu>
 	<menu_item_separator
 	 layout="topleft"
-- 
cgit v1.2.3


From b6a201f7020a454da86143402da471e24ae3b36f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 13 Oct 2023 21:06:58 +0300
Subject: SL-20382 Warn when moving no-copy items on drop

---
 indra/newview/skins/default/xui/en/notifications.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f2473e98d3..d1838fc7ef 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5960,6 +5960,22 @@ You have updated the location of this pick but the other details will retain the
      yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="ApplyInventoryToObject"
+   type="alertmodal">
+You are applying &apos;no copy&apos; inventory item.
+This item will be moved to object's inventory, not copied.
+
+Move the inventory item?
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Warn me before I apply &apos;no-copy&apos; items to an object"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="MoveInventoryFromObject"
-- 
cgit v1.2.3


From 09aedbb7a9b4bfa56b7acd3250d10c483a5ac219 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Mon, 16 Oct 2023 13:54:38 -0500
Subject: SL-20258 Fix for LSL spamming new probes into the scene deadlocking
 probe updater.  Add probe update debug display.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 8b39ea192b..0bfdead6e7 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2974,6 +2974,16 @@ function="World.EnvPreset"
            function="Advanced.ToggleInfoDisplay"
            parameter="reflection probes" />
         </menu_item_check>
+        <menu_item_check
+         label="Probe Updates"
+         name="Probe Updates">
+          <menu_item_check.on_check
+           function="Advanced.CheckInfoDisplay"
+           parameter="probe updates" />
+          <menu_item_check.on_click
+           function="Advanced.ToggleInfoDisplay"
+           parameter="probe updates" />
+        </menu_item_check>
         <menu_item_check
          label="Particles"
          name="Particles">
-- 
cgit v1.2.3


From 4c7920778fa3ea4b9ea9fe3945eb57d250a0527f Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 17 Oct 2023 18:12:13 +0300
Subject: SL-20457 allow creating new items from the right-click context menu

---
 .../skins/default/xui/en/menu_inventory.xml        | 236 ++++++++++++++++++++-
 1 file changed, 228 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 1907dc2438..3a8f360e2d 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -143,14 +143,6 @@
          function="Inventory.EmptyLostAndFound"
          parameter="rename" />
     </menu_item_call>
-    <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 Outfit"
      layout="topleft"
@@ -699,6 +691,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"
-- 
cgit v1.2.3


From e154fee226b4a33d5b55f3cebf1667e5d0604db5 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 30 Oct 2023 16:40:04 +0200
Subject: SL-20541 Reorder radio buttons in Edit tools Texture tab to match
 order in a Material

---
 .../newview/skins/default/xui/en/panel_tools_texture.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 5b15752eb7..3f4e3e804f 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -217,25 +217,25 @@
                 height="16" 
                 value="1"/>
                 <radio_item
-                label="Normal"
-                layout="topleft"
-                top_pad="1" 
-                height="16" 
-                name="Normal"
-                value="2"/>
-                <radio_item
                 label="Metallic/roughness"
                 name="Metallic/roughness"
                 height="16"
                 layout="topleft"
                 top_pad="1"
-                value="3"/>
+                value="2"/>
                 <radio_item
                 label="Emissive"
                 name="Emissive"
                 layout="topleft"
                 top_pad="1" 
                 height="16" 
+                value="3"/>
+                <radio_item
+                label="Normal"
+                layout="topleft"
+                top_pad="1" 
+                height="16" 
+                name="Normal"
                 value="4"/>
             </radio_group>
             <menu_button
-- 
cgit v1.2.3


From c2aba01f36eb1bd82718ac2cea6810a80bea93cc Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 2 Nov 2023 20:53:30 +0200
Subject: SL-20561 Rename Blinn Phong to Textures in the build floater

---
 indra/newview/skins/default/xui/en/panel_tools_texture.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 3f4e3e804f..fe01996623 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -152,7 +152,7 @@
              top_pad="5"
              width="90">
                 <combo_box.item
-                 label="Blinn-Phong"
+                 label="Textures"
                  name="Materials"
                  value="Materials" />
                 <combo_box.item
-- 
cgit v1.2.3