From f57864fbd5fcf287fbdb788fa6a0dc13b92253b3 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Fri, 8 Nov 2024 20:59:47 +0000
Subject: [PATCH] Slight mod to Whitelist reminder as per discussion

- remove the "ignore" option
- make it first run after install only
(pretty much the same behaviour - less scope for complaints.)
---
 indra/newview/app_settings/settings.xml              | 11 +++++++++++
 indra/newview/llstartup.cpp                          |  9 +++++++--
 indra/newview/skins/default/xui/en/notifications.xml |  4 ----
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index b63da471a3..ca5cbb114f 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -25920,5 +25920,16 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>FSShowWhitelistReminder</key>
+    <map>
+      <key>Comment</key>
+      <string>Show the whitelist reminder on first install.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
   </map>
 </llsd>
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index c81f62ff8d..a0202677c1 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -3336,8 +3336,13 @@ void login_show()
     //LLPanelLogin::show(   gViewerWindow->getWindowRectScaled(), login_callback, NULL );
     FSPanelLogin::show( gViewerWindow->getWindowRectScaled(), login_callback, NULL );
     // </FS:Ansariel> [FS Login Panel]
-
-    LLNotificationsUtil::add("WhitelistReminder"); // <FS:PP> Whitelist reminder
+    // <FS:PP> Whitelist reminder
+    if( gSavedSettings.getBOOL("FSShowWhitelistReminder") )
+    {
+        LLNotificationsUtil::add("WhitelistReminder"); 
+        gSavedSettings.setBOOL("FSShowWhitelistReminder", false);
+    }
+    // </FS:PP>
 }
 
 // Callback for when login screen is closed.  Option 0 = connect, option 1 = quit.
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index dda61c9ef3..eb52b744b9 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -14640,10 +14640,6 @@ Some antivirus programs may mistakenly block parts of [APP_NAME], slowing down i
 For detailed instructions on how to whitelist [APP_NAME] - including a list of files and folders to exclude - please visit our guide:
 
 https://wiki.firestormviewer.org/antivirus_whitelisting
-    <usetemplate
-     ignoretext="Show whitelist reminder on launch"
-     name="okignore"
-     yestext="OK"/>
   </notification>
 
 </notifications>