Merge pull request #4492 Merge Develop into Maint-C (2025.06)

Merge Develop into Maint-C (2025.06)

1 files changed, 12 insertions, 2 deletions

diff --git a/indra/newview/llmutelist.h b/indra/newview/llmutelist.h
index 13d579c61f..b65fd61fcc 100644
--- a/indra/newview/llmutelist.h
+++ b/indra/newview/llmutelist.h
@@ -74,6 +74,14 @@ class LLMuteList : public LLSingleton<LLMuteList>
     LLSINGLETON(LLMuteList);
     ~LLMuteList();
     /*virtual*/ void cleanupSingleton() override;
+
+    enum EMuteListState
+    {
+        ML_INITIAL,
+        ML_REQUESTED,
+        ML_LOADED,
+        ML_FAILED,
+    };
 public:
     // reasons for auto-unmuting a resident
     enum EAutoReason
@@ -107,7 +115,8 @@ public:
 
     static bool isLinden(const std::string& name);
 
-    bool isLoaded() const { return mIsLoaded; }
+    bool isLoaded() const { return mLoadState == ML_LOADED; }
+    bool getLoadFailed() const;
 
     std::vector<LLMute> getMutes() const;
 
@@ -167,7 +176,8 @@ private:
     typedef std::set<LLMuteListObserver*> observer_set_t;
     observer_set_t mObservers;
 
-    bool mIsLoaded;
+    EMuteListState mLoadState;
+    F64 mRequestStartTime;
 
     friend class LLDispatchEmptyMuteList;
 };