diff options
| author | CG Linden <cg@lindenlab.com> | 2010-01-26 13:44:24 -0800 |
|---|---|---|
| committer | CG Linden <cg@lindenlab.com> | 2010-01-26 13:44:24 -0800 |
| commit | b8856efd5ff0e4899bb369dfd0815e824cd3a432 (patch) | |
| tree | 4c99369867ed9e58b69dfad4ba8ee3a2e9a17b9b /indra/newview/llchathistory.cpp | |
| parent | 5fc9d8bddad16b7d8dc6d481107a8ce690fdf731 (diff) | |
| parent | fee564c26e1018787cf70b95fc677c1da447118c (diff) | |
Pulled from viewer-2-0
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index a46cd84b60..d6a7edee5b 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -550,8 +550,8 @@ void LLChatHistory::appendMessage(const LLChat& chat, const bool use_plain_text_ if (mLastFromName == chat.mFromName && mLastFromID == chat.mFromID && mLastMessageTime.notNull() - && (new_message_time.secondsSinceEpoch() - mLastMessageTime.secondsSinceEpoch()) < 60.0 - ) + && (new_message_time.secondsSinceEpoch() - mLastMessageTime.secondsSinceEpoch()) < 60.0 + && mLastMessageTimeStr.size() == chat.mTimeStr.size()) //*HACK to distinguish between current and previous chat session's histories { view = getSeparator(); p.top_pad = mTopSeparatorPad; @@ -585,6 +585,7 @@ void LLChatHistory::appendMessage(const LLChat& chat, const bool use_plain_text_ mLastFromName = chat.mFromName; mLastFromID = chat.mFromID; mLastMessageTime = new_message_time; + mLastMessageTimeStr = chat.mTimeStr; } std::string message = irc_me ? chat.mText.substr(3) : chat.mText; |