From 53d87aa0937011fd658a78ac4ee1e02e755041dc Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Fri, 19 Jun 2026 20:25:30 +0200
Subject: [PATCH] Make error notifications not ignorable; Also fix invalid XUI

---
 .../default/xui/en/floater_omnifilter.xml     | 96 +++++++++----------
 .../skins/default/xui/en/notifications.xml    | 35 +++----
 2 files changed, 59 insertions(+), 72 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/floater_omnifilter.xml b/indra/newview/skins/default/xui/en/floater_omnifilter.xml
index 2fce029305..247fe80572 100644
--- a/indra/newview/skins/default/xui/en/floater_omnifilter.xml
+++ b/indra/newview/skins/default/xui/en/floater_omnifilter.xml
@@ -20,7 +20,6 @@
 		NEW RULE
 	</floater.string>
 
-	<!-- <FS:minerjr> [FIRE-36763] - Add rule sets to Omnifilter -->	<!-- <FS:minerjr> [FIRE-36763] - Add rule sets to Omnifilter -->
 	<panel
 	 name="needle_rule_set_controls"
 	 layout="topleft"
@@ -28,56 +27,53 @@
 	 height="25"
 	 left="0"
 	 min_height="25"
-	 top="20"
-	 user_resize="false">
-    <text
-     name="lbl_ruleset"
-     layout="topleft"
-     follows="left|top"
-     height="20"
-     width="70"
-     left="8"
-     top="0"
-     valign="center"
-     value="Rule Sets:"/>
-	 <combo_box
-	  height="20"
-	  layout="topleft"
-	  left_pad="4"
-	  follows="left|top"
-	  name="cmb_rule_sets"
-	  tool_tip="Choose the Omnifilter Rule Set to use."
-	  width="150">
-	 </combo_box>
-	 <button
-	  name="btn_rule_set_new"
-	  layout="topleft"
-	  follows="left|top"
-	  width="150"
-	  height="20"
-	  left_pad="4"
-	  label="New Rule Set"
-	  tool_tip="Create a new blank Omnifilter Rule Set."/>
-	 <button
-	  name="btn_rule_set_clone"
-	  layout="topleft"
-	  follows="left|top"
-	  width= "150"
-	  height="20"
-	  left_pad="4"
-	  label="Clone Rule Set"
-	  tool_tip="Create a clone of the current Omnifilter Rule Set."/>
-	 <button
-	  name="btn_rule_set_remove"
-	  layout="topleft"
-	  follows="left|top"
-	  width= "150"
-	  height="20"
-	  left_pad="4"
-	  label="Remove Rule Set"
-	  tool_tip="Remove the current Omnifilter Rule Set."/>
+	 top="20">
+		<text
+		 name="lbl_ruleset"
+		 layout="topleft"
+		 follows="left|top"
+		 height="20"
+		 width="70"
+		 left="8"
+		 top="0"
+		 valign="center"
+		 value="Rule Sets:"/>
+		<combo_box
+		 height="20"
+		 layout="topleft"
+		 left_pad="4"
+		 follows="left|top"
+		 name="cmb_rule_sets"
+		 tool_tip="Choose the Omnifilter Rule Set to use."
+		 width="150"/>
+		<button
+		 name="btn_rule_set_new"
+		 layout="topleft"
+		 follows="left|top"
+		 width="150"
+		 height="20"
+		 left_pad="4"
+		 label="New Rule Set"
+		 tool_tip="Create a new blank Omnifilter Rule Set."/>
+		<button
+		 name="btn_rule_set_clone"
+		 layout="topleft"
+		 follows="left|top"
+		 width= "150"
+		 height="20"
+		 left_pad="4"
+		 label="Clone Rule Set"
+		 tool_tip="Create a clone of the current Omnifilter Rule Set."/>
+		<button
+		 name="btn_rule_set_remove"
+		 layout="topleft"
+		 follows="left|top"
+		 width= "150"
+		 height="20"
+		 left_pad="4"
+		 label="Remove Rule Set"
+		 tool_tip="Remove the current Omnifilter Rule Set."/>
 	</panel>
-	<!-- </FS:minerjr> [FIRE-36763] -->
 	<layout_stack
 	 name="needle_list_stack"
 	 layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 68dec4084c..d1320065cf 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -15153,10 +15153,9 @@ You can enable saving transcripts under Preferences &gt; Privacy &gt; Logs &amp;
   <!-- <FS:minerjr> [FIRE-36763] - Add rule sets to Omnifilter -->
     <notification
      icon="alertmodal.tga"
-     label="New Rule Set"
      name="OmniFilterNewRuleSet"
      type="alertmodal">
-        Enter a name for the New Rule Set:
+        Enter a name for the new rule set:
         <tag>confirm</tag>
         <form name="form">
             <input name="new_name" type="text" width="300" default="true">
@@ -15181,8 +15180,7 @@ You can enable saving transcripts under Preferences &gt; Privacy &gt; Logs &amp;
       type="alertmodal">
         Blank names are not allowed. Please try again with a name.
         <usetemplate
-            ignoretext="Warn me again when trying to add a New Rule Set with no name."
-            name="okignore"
+            name="okbutton"
             yestext="OK"/>
     </notification>
     <notification
@@ -15193,17 +15191,15 @@ You can enable saving transcripts under Preferences &gt; Privacy &gt; Logs &amp;
       type="alertmodal">
         Duplicate names are not allowed. Please try again with a different name.
         <usetemplate
-            ignoretext="Warn me again when trying to add a New Rule Set with a duplicate name."
-            name="okignore"
+            name="okbutton"
             yestext="OK"/>
     </notification>
 
     <notification
      icon="alertmodal.tga"
-     label="Clone Rule Set"
      name="OmniFilterCloneRuleSet"
      type="alertmodal">
-        Enter a name to the Cloned Rule Set:
+        Enter a name to the cloned rule set:
         <tag>confirm</tag>
         <form name="form">
             <input name="new_name" type="text" width="300" default="true">
@@ -15228,8 +15224,7 @@ You can enable saving transcripts under Preferences &gt; Privacy &gt; Logs &amp;
       type="alertmodal">
         Blank names are not allowed. Please try again with a name.
         <usetemplate
-            ignoretext="Warn me again when trying to add a Cloned Rule Set with no name."
-            name="okignore"
+            name="okbutton"
             yestext="OK"/>
     </notification>
     <notification
@@ -15240,8 +15235,7 @@ You can enable saving transcripts under Preferences &gt; Privacy &gt; Logs &amp;
       type="alertmodal">
         Duplicate names are not allowed. Please try again with a different name.
         <usetemplate
-            ignoretext="Warn me again when trying to add a Cloned Rule Set with a duplicate name."
-            name="okignore"
+            name="okbutton"
             yestext="OK"/>
     </notification>
 
@@ -15252,7 +15246,7 @@ You can enable saving transcripts under Preferences &gt; Privacy &gt; Logs &amp;
         Are you sure you want to remove [RULESETNAME]?
         <tag>confirm</tag>
         <usetemplate
-        ignoretext="Confirm before I remove a Rule Set."
+        ignoretext="Confirm before I remove a rule set."
         name="okcancelignore"
         notext="Cancel"
         yestext="OK"/>
@@ -15263,10 +15257,9 @@ You can enable saving transcripts under Preferences &gt; Privacy &gt; Logs &amp;
       sound="UISndAlert"
       persist="true"
       type="alertmodal">
-        Unable to remove the Default Rule Set.
+        Unable to remove the default rule ret.
         <usetemplate
-            ignoretext="Warn me again when trying to remove the Default Rule Set."
-            name="okignore"
+            name="okbutton"
             yestext="OK"/>
     </notification>
     <notification
@@ -15275,10 +15268,9 @@ You can enable saving transcripts under Preferences &gt; Privacy &gt; Logs &amp;
       sound="UISndAlert"
       persist="true"
       type="alertmodal">
-        Unable to remove the Rule Set due to index out of bounds.
+        Unable to remove the rule set due to index out of bounds.
         <usetemplate
-            ignoretext="Warn me again when trying to remove a Rule Set with an index [OUTOFBOUNDS] out of bounds."
-            name="okignore"
+            name="okbutton"
             yestext="OK"/>
     </notification>
     <notification
@@ -15287,10 +15279,9 @@ You can enable saving transcripts under Preferences &gt; Privacy &gt; Logs &amp;
       sound="UISndAlert"
       persist="true"
       type="alertmodal">
-        Unable to remove the Rule Set due to name not found.
+        Unable to remove the rule set due to name not found.
         <usetemplate
-            ignoretext="Warn me again when trying to remove a Rule Set with an invalid name '[INVALIDNAME]'."
-            name="okignore"
+            name="okbutton"
             yestext="OK"/>
     </notification>
   <!-- </FS:minerjr> [FIRE-36763] -->