3 files changed, 9 insertions, 5 deletions
diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp
index b1e42e11fb..3f60dc5d26 100644
--- a/indra/newview/llimprocessing.cpp
+++ b/indra/newview/llimprocessing.cpp
@@ -1534,7 +1534,7 @@ void LLIMProcessing::requestOfflineMessages()
         && isAgentAvatarValid()
         && gAgent.getRegion()
         && gAgent.getRegion()->capabilitiesReceived()
-        && (LLMuteList::getInstance()->isLoaded() || LLMuteList::getInstance()->getLoadFailed()))
+        && LLMuteList::getInstance()->updateLoadState())
     {
         std::string cap_url = gAgent.getRegionCapability("ReadOfflineMsgs");
 
diff --git a/indra/newview/llmutelist.cpp b/indra/newview/llmutelist.cpp
index 154e826196..02a5a43c6b 100644
--- a/indra/newview/llmutelist.cpp
+++ b/indra/newview/llmutelist.cpp
@@ -214,9 +214,9 @@ bool LLMuteList::isLinden(const std::string& name)
     return last_name == "linden";
 }
 
-bool LLMuteList::getLoadFailed()
+bool LLMuteList::updateLoadState()
 {
-    if (mLoadState == ML_FAILED)
+    if (isLoaded() || isFailed())
     {
         return true;
     }
@@ -227,7 +227,7 @@ bool LLMuteList::getLoadFailed()
         {
             LL_WARNS() << "Mute list request timed out; trying cache fallback once" << LL_ENDL;
             tryLoadCacheFallback(gAgent.getID(), "request timeout");
-            return mLoadState == ML_FAILED;
+            return isLoaded() || isFailed();
         }
     }
     return false;
diff --git a/indra/newview/llmutelist.h b/indra/newview/llmutelist.h
index 34857e2006..ff010a02e8 100644
--- a/indra/newview/llmutelist.h
+++ b/indra/newview/llmutelist.h
@@ -125,7 +125,11 @@ public:
     static bool isLinden(const std::string& name);
 
     bool isLoaded() const { return mLoadState == ML_LOADED; }
-    bool getLoadFailed();
+    bool isFailed() const { return mLoadState == ML_FAILED; }
+
+    // Advance the load state machine, trying cache fallback if necessary.
+    // Return value indicates mute list consumption readiness.
+    bool updateLoadState();
 
     std::vector<LLMute> getMutes() const;