Merge tag 'Second_Life_Release#db59a05a-26.5' into 26.5

1 files changed, 8 insertions, 0 deletions

diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 85d69f0a30..8b6c0ed493 100644
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -43,6 +43,7 @@
 #include "llconversationlog.h"
 #include "llfloateravatarpicker.h"  // for LLFloaterAvatarPicker
 #include "llfloaterconversationpreview.h"
+#include "llchatservicehistory.h"
 #include "llfloatergroupinvite.h"
 #include "llfloatergroups.h"
 #include "llfloaterreg.h"
@@ -1287,6 +1288,12 @@ void LLAvatarActions::inviteToGroup(const LLUUID& id)
 // static
 void LLAvatarActions::viewChatHistory(const LLUUID& id)
 {
+    // A pending account-wide deletion suppresses both transcript and service sources.
+    if (LLChatServiceHistory::historySuppressed())
+    {
+        return;
+    }
+
     const std::vector<LLConversation>& conversations = LLConversationLog::instance().getConversations();
     std::vector<LLConversation>::const_iterator iter = conversations.begin();
 
@@ -1307,6 +1314,7 @@ void LLAvatarActions::viewChatHistory(const LLUUID& id)
         LLAvatarNameCache::get(id, &avatar_name);
         extended_id[LL_FCP_COMPLETE_NAME] = avatar_name.getCompleteName();
         extended_id[LL_FCP_ACCOUNT_NAME] = avatar_name.getAccountName();
+        extended_id[LL_FCP_PARTICIPANT_ID] = id;
         LLFloaterReg::showInstance("preview_conversation", extended_id, true);
     }
 }