diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-01-28 17:26:45 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-01-28 17:26:45 -0700 |
| commit | 2a6b48c9b0c813c5e4ff8ac176fdf4e6c9466c22 (patch) | |
| tree | 7f608467b3608127049ddc78d5045da032777cb4 /indra/newview/llimview.cpp | |
| parent | 3e44cb06df22dd1b684dc8574c3b44d0851527bc (diff) | |
| parent | 2998552f3d7447da316afdd1713595528596a0c5 (diff) | |
DRTVWR-440, merge in latest from 6.3.7 release
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index e331a51bda..d5142a4496 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -843,7 +843,7 @@ void LLIMModel::LLIMSession::loadHistory() std::list<LLSD> chat_history; //involves parsing of a chat history - LLLogChat::loadChatHistory(mHistoryFileName, chat_history); + LLLogChat::loadChatHistory(mHistoryFileName, chat_history, LLSD(), isGroupChat()); addMessagesFromHistory(chat_history); } } @@ -907,6 +907,11 @@ bool LLIMModel::LLIMSession::isP2P() return IM_NOTHING_SPECIAL == mType; } +bool LLIMModel::LLIMSession::isGroupChat() +{ + return IM_SESSION_GROUP_START == mType || (IM_SESSION_INVITE == mType && gAgent.isInGroup(mSessionID)); +} + bool LLIMModel::LLIMSession::isOtherParticipantAvaline() { return !mOtherParticipantIsAvatar; @@ -964,6 +969,10 @@ void LLIMModel::LLIMSession::buildHistoryFileName() mHistoryFileName = LLCacheName::buildUsername(mName); } } + else if (isGroupChat()) + { + mHistoryFileName = mName + GROUP_CHAT_SUFFIX; + } } //static |