diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-12-18 19:15:53 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-12-18 19:15:53 -0800 |
| commit | accad65d6a5259293bd329fa2292f66973cb30b1 (patch) | |
| tree | fb41995538d300b39675dbc82cc0785f094379c4 /indra/newview/llimview.cpp | |
| parent | a4975ace20faa3b6de952f26865dca53dcb9060c (diff) | |
| parent | a8d8518a9ea3630f3f9df83a2aa3a8829b3a90a4 (diff) | |
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui.
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 26be7f6bbf..7e02915b43 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -2699,12 +2699,13 @@ LLUUID LLIMMgr::addSession( { LLFloaterIMSession* im_floater = LLFloaterIMSession::findInstance(floater_id); - if (im_floater && im_floater->getStartConferenceInSameFloater()) + if (im_floater) { // The IM floater should be initialized with a new session_id // so that it is found by that id when creating a chiclet in LLFloaterIMSession::onIMChicletCreated, // and a new floater is not created. im_floater->initIMSession(session_id); + im_floater->reloadMessages(); } } |