From fa653e9ddc4b472868efe6ee7077d75293c09c92 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Wed, 17 Dec 2025 12:29:25 +0100
Subject: [PATCH] Mitigate global online status toggle firing during startup
 for some people Prevent GlobalOnlineStatusToggle from triggering confirmation
 and rights updates while the viewer is still starting up. Technically, it may
 actually avoid online status flicker at login / unintended online status
 changes as well.

Signed-off-by: PanteraPolnocy <panterapolnocy@gmail.com>
---
 indra/newview/llviewercontrol.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 8c37f6cfb2..83e32e3b2b 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -913,6 +913,11 @@ void handleUsernameFormatOptionChanged(const LLSD& newvalue)
 // <FS:Ansariel> Global online status toggle
 void handleGlobalOnlineStatusChanged(const LLSD& newvalue)
 {
+    if (LLStartUp::getStartupState() < STATE_STARTED)
+    {
+        // Skip the checks if not inworld; Ignore startup-time setting application, if it somehow fires
+        return;
+    }
     if (gSavedPerAccountSettings.getBOOL("GlobalOnlineStatusCurrentlyReverting"))
     {
         gSavedPerAccountSettings.setBOOL("GlobalOnlineStatusCurrentlyReverting", false);