diff options
| author | Cho <cho@lindenlab.com> | 2013-01-29 00:19:05 +0000 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-01-29 00:19:05 +0000 |
| commit | f9d44737b780542c4f4e3f02122b0cf9fb0fd8c6 (patch) | |
| tree | 288ba6cb91c0f3e617b0327146bc73773912a58f /indra/newview/llfloaterimsession.cpp | |
| parent | 427725c2a6d5c50468e7579a4d3b92795425723f (diff) | |
| parent | af969270990ca719277def274b8ebf20539cc435 (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 a2c7bacb5d..7ed683d701 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(); |