diff options
| author | Cho <cho@lindenlab.com> | 2013-01-29 00:19:29 +0000 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-01-29 00:19:29 +0000 |
| commit | acd28e28bc6ff48789ba321a470f05f7162ddd46 (patch) | |
| tree | 9d314ca328862b75b8ab50852bec05a47fe48a2e /indra/newview/llfloaterimsession.cpp | |
| parent | 44b681f5db9435f98d52525621aa98b0a8ed3063 (diff) | |
| parent | f9d44737b780542c4f4e3f02122b0cf9fb0fd8c6 (diff) | |
merging latest changes
Diffstat (limited to 'indra/newview/llfloaterimsession.cpp')
| -rw-r--r-- | indra/newview/llfloaterimsession.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimsession.cpp b/indra/newview/llfloaterimsession.cpp index 31d2c67e29..f754853b82 100644 --- a/indra/newview/llfloaterimsession.cpp +++ b/indra/newview/llfloaterimsession.cpp @@ -847,8 +847,18 @@ void LLFloaterIMSession::updateMessages() } } -void LLFloaterIMSession::reloadMessages() +void LLFloaterIMSession::reloadMessages(bool clean_messages/* = false*/) { + if (clean_messages) + { + LLIMModel::LLIMSession * sessionp = LLIMModel::instance().findIMSession(mSessionID); + + if (NULL != sessionp) + { + sessionp->loadHistory(); + } + } + mChatHistory->clear(); mLastMessageIndex = -1; updateMessages(); |