From 32d766cb3af0b79a722b838dcebffef29a755cfe Mon Sep 17 00:00:00 2001
From: Brad Linden <brad@lindenlab.com>
Date: Tue, 15 Oct 2024 15:20:16 -0700
Subject: Provide affordances to disable automatic downrezing of textures when
 SL is in background

secondlife/viewer#2549
---
 indra/newview/skins/default/xui/en/notifications.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5ce73b2cfa..40a8557bb8 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -12583,4 +12583,19 @@ are wearing now.
        yestext="OK"/>
   </notification>
 
+  <notification
+   icon="notify.tga"
+   name="TextureDiscardBackgrounded"
+   type="notify">
+      <unique>
+          <context>DELAY</context>
+      </unique>
+      To improve system performance, [SECOND_LIFE] has reduced texture memory usage after being in the background for [DELAY] seconds.  It may take some time for texture image quality to return to normal.
+     <usetemplate
+       ignoretext="Ask me about background texture memory usage and recovery"
+       name="okcancelignore"
+       yestext="OK"
+       notext="Disable"/>
+  </notification>
+
 </notifications>
-- 
cgit v1.2.3


From 7827f66caefe358f050caf4d1215d5e956192114 Mon Sep 17 00:00:00 2001
From: Rye <rye@lindenlab.com>
Date: Tue, 29 Oct 2024 02:30:52 -0700
Subject: Add handling for downrezzing textures when viewer is minimized, fix
 downrezzing textures when minimized due to texture system not processesing

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 40a8557bb8..509e6e9766 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -12598,4 +12598,19 @@ are wearing now.
        notext="Disable"/>
   </notification>
 
+  <notification
+   icon="notify.tga"
+   name="TextureDiscardMinimized"
+   type="notify">
+      <unique>
+          <context>DELAY</context>
+      </unique>
+      To improve system performance, [SECOND_LIFE] has reduced texture memory usage after being minimized for [DELAY] seconds.  It may take some time for texture image quality to return to normal.
+     <usetemplate
+       ignoretext="Ask me about minimized texture memory usage and recovery"
+       name="okcancelignore"
+       yestext="OK"
+       notext="Disable"/>
+  </notification>
+    
 </notifications>
-- 
cgit v1.2.3


From 4b5fa5349e06ce3471875e0c401f9119831ed887 Mon Sep 17 00:00:00 2001
From: Rye <rye@lindenlab.com>
Date: Wed, 30 Oct 2024 17:25:16 -0400
Subject: Fix exposure in advanced graphics preferences being limited to 1.5
 instead of 4 (#2978)

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

(limited to 'indra/newview/skins')

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 8bb15d1d3a..23516c938a 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
@@ -821,7 +821,7 @@
     layout="topleft"
     left="420"
     min_val="0.5"
-    max_val="1.5"
+    max_val="4.0"
     name="RenderExposure"
     show_text="true"
     top_delta="24"
-- 
cgit v1.2.3


From 76ff2e0bbc6a209addfa0f427459e7877d87938d Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 1 Nov 2024 17:04:37 +0200
Subject: #2938 show confirmation before closing Conference chat

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index cbc0f7ceae..526be61207 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9595,6 +9595,22 @@ Are you sure you want to leave this call?
     </usetemplate>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmLeaveAdhoc"
+   type="alertmodal">
+Are you sure you want to leave this conference chat?
+    <tag>confirm</tag>
+    <tag>voice</tag>
+    <usetemplate
+     ignoretext="Confirm before I leave conference chat"
+     name="okcancelignore"
+     notext="No"
+     yestext="Yes">
+      <unique/>
+    </usetemplate>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="ConfirmMuteAll"
-- 
cgit v1.2.3


From a57d82b3a9337eb4ac00340e80749ac97392e03e Mon Sep 17 00:00:00 2001
From: Rye <rye@lindenlab.com>
Date: Fri, 1 Nov 2024 03:30:23 -0400
Subject: Eliminate reduntant copies and full screen passes from post process
 effect chain

---
 .../xui/en/floater_preferences_graphics_advanced.xml      | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

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 e81ff7f343..610cffb84a 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
@@ -924,6 +924,19 @@
   </combo_box>
   <!-- End of mirror settings -->
   <!-- Sharpening Settings -->
+  <check_box
+    control_name="RenderCAS"
+    height="16"
+    initial_value="false"
+    label="Sharpening"
+    layout="topleft"
+    left="420"
+    name="Sharpening"
+    top_delta="24"
+    width="240">
+    <check_box.commit_callback
+      function="Pref.RenderOptionUpdate" />
+  </check_box>
   <slider
     control_name="RenderCASSharpness"
     decimal_digits="1"
@@ -931,7 +944,7 @@
     height="16"
     increment="0.1"
     initial_value="160"
-    label="Sharpening:"
+    label="Sharpening Strength:"
     label_width="145"
     layout="topleft"
     left="420"
-- 
cgit v1.2.3


From 471f874d17aea462c354c18673caac66bd43e9e7 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 8 Nov 2024 16:49:34 -0800
Subject: Server Issue #1493: New notification message for llTransferOwnership.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 4d74261a9a..9cca2d5b4d 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -10348,6 +10348,14 @@ You are now the owner of object [OBJECT_NAME]
 
   <notification
    icon="alertmodal.tga"
+   name="NowOwnObjectInv"
+   type="notify">
+   <tag>fail</tag>
+You are now the owner of object [OBJECT_NAME] and it has been placed in your inventory.
+  </notification>
+
+    <notification
+   icon="alertmodal.tga"
    name="CantRezOnLand"
    type="notify">
    <tag>fail</tag>
-- 
cgit v1.2.3