From d84897967e836cd2dadf8f609eb98946f500d5b1 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 22 Jul 2025 01:54:33 +0300
Subject: #4318 Warn or log when texture gets scaled down

for material and model upload
---
 .../newview/skins/default/xui/en/floater_model_preview.xml |  1 +
 indra/newview/skins/default/xui/en/notifications.xml       | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index a86b9c7da2..f11d687840 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -39,6 +39,7 @@
   <string name="decomposing">Analyzing...</string>
   <string name="simplifying">Simplifying...</string>
   <string name="tbd">TBD</string>
+  <string name="ModelTextureScaling">One or more textures in this model were scaled to be within the allowed limits.</string>
   
   <!-- Warnings and info from model loader-->
   <string name="TooManyJoint">Skinning disabled due to too many joints: [JOINTS], maximum: [MAX]</string>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 82e77119ab..a7e892f6f2 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7135,6 +7135,20 @@ You don&apos;t have permission to view this notecard.
     <tag>fail</tag>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="MaterialImagesWereScaled"
+   type="alertmodal">
+One or more textures in this material were scaled to be within the allowed limits.
+Textures must have power of two dimensions and must not exceed [MAX_SIZE]x[MAX_SIZE] pixels.
+    <unique/>
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Warn if textures will be scaled during upload."
+     name="okignore"
+     yestext="OK"/>
+  </notification>
+
   <notification
    icon="notifytip.tga"
    name="RezItemNoPermissions"
-- 
cgit v1.2.3


From c4204a9687a6f41e49879db1e24dcb53a372d31d Mon Sep 17 00:00:00 2001
From: Darl <me@darl.cat>
Date: Wed, 23 Jul 2025 19:07:56 -0500
Subject: Media first click interact large number value fix

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index de6132aec6..52413abe74 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -422,11 +422,11 @@
         <item
             label="Anyone's objects"
             name="media_first_interact_any"
-            value="1073741823"/>
+            value="32767"/>
         <item
             label="All MOAP"
             name="media_first_click_all"
-            value="2147483647"/>
+            value="65535"/>
     </combo_box>
    <check_box
     name="media_show_on_others_btn"
-- 
cgit v1.2.3