From 68cf572514415bcd7ff014ae728c376b8928c159 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Wed, 11 Oct 2023 15:17:42 -0700
Subject: SL-20450: Fix missing LSL keyword INVENTORY_MATERIAL

---
 indra/newview/app_settings/keywords.ini             | 1 +
 indra/newview/app_settings/keywords_lsl_default.xml | 9 +++++++++
 2 files changed, 10 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini
index 9699eda96b..4e177ab518 100644
--- a/indra/newview/app_settings/keywords.ini
+++ b/indra/newview/app_settings/keywords.ini
@@ -274,6 +274,7 @@ INVENTORY_NOTECARD	Passed to task inventory library functions to reference notec
 INVENTORY_BODYPART	Passed to task inventory library functions to reference body parts
 INVENTORY_ANIMATION	Passed to task inventory library functions to reference animations
 INVENTORY_GESTURE	Passed to task inventory library functions to reference gestures
+INVENTORY_MATERIAL	Passed to task inventory library functions to reference materials
 INVENTORY_ALL		Passed to task inventory library functions to reference all inventory items
 INVENTORY_NONE		Returned by llGetInventoryType when no item is found
 
diff --git a/indra/newview/app_settings/keywords_lsl_default.xml b/indra/newview/app_settings/keywords_lsl_default.xml
index d641883d5a..893b017367 100644
--- a/indra/newview/app_settings/keywords_lsl_default.xml
+++ b/indra/newview/app_settings/keywords_lsl_default.xml
@@ -1963,6 +1963,15 @@
             <key>tooltip</key>
             <string/>
          </map>
+         <key>INVENTORY_MATERIAL</key>
+         <map>
+            <key>type</key>
+            <string>integer</string>
+            <key>value</key>
+            <integer>57</integer>
+            <key>tooltip</key>
+            <string/>
+         </map>
          <key>JSON_APPEND</key>
          <map>
             <key>type</key>
-- 
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')

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')

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 b877e80d70875ff01ee0f522b775b766838d7404 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 13 Oct 2023 20:08:02 +0300
Subject: SL-20464 Don't allow enetring non-unicode material name

---
 indra/newview/llmaterialeditor.cpp  | 6 +++++-
 indra/newview/lltoastalertpanel.cpp | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index be6f8d72e5..6b70b40860 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -1571,7 +1571,11 @@ void LLMaterialEditor::onSaveAsMsgCallback(const LLSD& notification, const LLSD&
         }
         else
         {
-            LLNotificationsUtil::add("InvalidMaterialName");
+            LLNotificationsUtil::add("InvalidMaterialName", LLSD(), LLSD(), [this](const LLSD& notification, const LLSD& response) 
+                {
+                    LLNotificationsUtil::add("SaveMaterialAs", LLSD().with("DESC", mMaterialName), LLSD(),
+                        boost::bind(&LLMaterialEditor::onSaveAsMsgCallback, this, _1, _2));
+                });
         }
     }
 }
diff --git a/indra/newview/lltoastalertpanel.cpp b/indra/newview/lltoastalertpanel.cpp
index d35833fac9..8bf078477a 100644
--- a/indra/newview/lltoastalertpanel.cpp
+++ b/indra/newview/lltoastalertpanel.cpp
@@ -295,7 +295,8 @@ LLToastAlertPanel::LLToastAlertPanel( LLNotificationPtr notification, bool modal
 			mLineEditor->setText(edit_text_contents);
 
 			std::string notif_name = mNotification->getName();
-			if (("SaveOutfitAs" == notif_name) || ("SaveSettingAs" == notif_name) || ("CreateLandmarkFolder" == notif_name) || ("CreateSubfolder" == notif_name))
+			if (("SaveOutfitAs" == notif_name) || ("SaveSettingAs" == notif_name) || ("CreateLandmarkFolder" == notif_name) || 
+                ("CreateSubfolder" == notif_name) || ("SaveMaterialAs" == notif_name))
 			{
 				mLineEditor->setPrevalidate(&LLTextValidate::validateASCII);
 			}
-- 
cgit v1.2.3