Mute list fallback to cache if timed out

indra/newview/llblocklist.cpp

@@ -48,6 +48,7 @@ LLBlockList::LLBlockList(const Params& p)
 
     LLMuteList::getInstance()->addObserver(this);
     mMuteListSize = static_cast<U32>(LLMuteList::getInstance()->getMutes().size());
+    updateNoItemsCommentText();
 
     // Set up context menu.
     LLUICtrl::CommitCallbackRegistry::ScopedRegistrar registrar;
@@ -101,8 +102,35 @@ BlockListActionType LLBlockList::getCurrentMuteListActionType()
     return type;
 }
 
+void LLBlockList::updateNoItemsCommentText()
+{
+    const LLMuteList* mute_list = LLMuteList::getInstance();
+    if (!mute_list->isLoaded() && !mute_list->isFailed())
+    {
+        setNoItemsCommentText(mLoadingItemsMsg);
+    }
+    else if (mute_list->isFailed())
+    {
+        setNoItemsCommentText(mFailedItemsMsg);
+    }
+    else
+    {
+        updateNoItemsMessage(mNameFilter);
+    }
+}
+
+void LLBlockList::onChange()
+{
+    // Something changed, not sure what so force a refresh.
+    mShouldAddAll = true;
+    mActionType = NONE;
+    updateNoItemsCommentText();
+    setDirty();
+}
+
 void LLBlockList::onChangeDetailed(const LLMute &mute)
 {
+    updateNoItemsCommentText();
     mActionType = getCurrentMuteListActionType();
 
     mCurItemId = mute.mID;
@@ -197,6 +225,7 @@ void LLBlockList::addNewItem(const LLMute* mute)
 
 void LLBlockList::refresh()
 {
+    updateNoItemsCommentText();
     bool have_filter = !mNameFilter.empty();
 
     // save selection to restore it after list rebuilt
@@ -208,6 +237,8 @@ void LLBlockList::refresh()
         clear();
         createList();
         mShouldAddAll = false;
+        // Full rebuild supersedes any queued incremental action. This ensures list consistency.
+        mActionType = NONE;
     }
     else
     {
@@ -246,7 +277,9 @@ void LLBlockList::refresh()
         {
             LLBlockedListItem * curItem = dynamic_cast<LLBlockedListItem *> (*it);
             if(curItem)
-    {
+            {
+                // Refresh item text styling each pass so filtering keeps highlight in sync.
+                curItem->highlightName(mNameFilter);
                 hideListItem(curItem, findInsensitive(curItem->getName(), mNameFilter));
             }
         }

indra/newview/llblocklist.h

@@ -58,7 +58,7 @@ class LLBlockList: public LLFlatListViewEx, public LLMuteListObserver
     LLToggleableMenu*   getContextMenu() const { return mContextMenu.get(); }
     LLBlockedListItem*  getBlockedItem() const;
 
-    virtual void onChange() { }
+    virtual void onChange();
     virtual void onChangeDetailed(const LLMute& );
     virtual void draw();
 
@@ -68,6 +68,8 @@ class LLBlockList: public LLFlatListViewEx, public LLMuteListObserver
     void refresh();
 
     U32 getMuteListSize() { return mMuteListSize; }
+    void setLoadingItemsMsg(const std::string& msg) { mLoadingItemsMsg = msg; updateNoItemsCommentText(); }
+    void setFailedItemsMsg(const std::string& msg) { mFailedItemsMsg = msg; updateNoItemsCommentText(); }
 
 private:
 
@@ -83,6 +85,7 @@ class LLBlockList: public LLFlatListViewEx, public LLMuteListObserver
     bool isMenuItemVisible(const LLSD& userdata);
     void toggleMute(U32 flags);
     void createList();
+    void updateNoItemsCommentText();
 
     BlockListActionType getCurrentMuteListActionType();
 
@@ -100,6 +103,8 @@ class LLBlockList: public LLFlatListViewEx, public LLMuteListObserver
     LLMute::EType               mCurItemType;
     U32                         mCurItemFlags;
     std::string                 mPrevNameFilter;
+    std::string                 mLoadingItemsMsg;
+    std::string                 mFailedItemsMsg;
 
 };
 

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");