From 17fbbef67b2ee853b6ea424fcc617089d848d4a7 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 14 Mar 2025 20:40:12 +0200
Subject: #3745 fix for showing system notification on login

---
 indra/newview/llcallingcard.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp
index 549c7ed0e4..829b6380cd 100644
--- a/indra/newview/llcallingcard.cpp
+++ b/indra/newview/llcallingcard.cpp
@@ -42,6 +42,7 @@
 #include "llinventorymodel.h"
 #include "llnotifications.h"
 #include "llslurl.h"
+#include "llstartup.h"
 #include "llimview.h"
 #include "lltrans.h"
 #include "llviewercontrol.h"
@@ -743,7 +744,11 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online)
 
         mModifyMask |= LLFriendObserver::ONLINE;
         instance().notifyObservers();
-        gInventory.notifyObservers();
+        // Skip if we had received the friends list before the inventory callbacks were properly initialized
+        if (LLStartUp::getStartupState() > STATE_INVENTORY_CALLBACKS)
+        {
+            gInventory.notifyObservers();
+        }
     }
 }
 
-- 
cgit v1.2.3