summaryrefslogtreecommitdiff
path: root/indra/newview/llcallingcard.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2025-04-18 21:36:56 +0300
committerGitHub <noreply@github.com>2025-04-18 21:36:56 +0300
commit9a333e65c4019540d5675e72ac57ef5ab106aab0 (patch)
tree55fa0d6d0de4521f0d8f764bb13b2e6c069602bb /indra/newview/llcallingcard.cpp
parent3d5f1541dd9980196ba0c8a3c3396c8ed3384d1e (diff)
parent4cccf8af43c8ebd9f947b9050a0403f65d0de7ee (diff)
Merge develop into release/2025.04
Diffstat (limited to 'indra/newview/llcallingcard.cpp')
-rw-r--r--indra/newview/llcallingcard.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp
index 829b6380cd..76e308a966 100644
--- a/indra/newview/llcallingcard.cpp
+++ b/indra/newview/llcallingcard.cpp
@@ -504,7 +504,7 @@ void LLAvatarTracker::idleNotifyObservers()
void LLAvatarTracker::notifyObservers()
{
- if (mIsNotifyObservers)
+ if (mIsNotifyObservers || (LLStartUp::getStartupState() <= STATE_INVENTORY_CALLBACKS))
{
// Don't allow multiple calls.
// new masks and ids will be processed later from idle.