diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-06-27 17:08:19 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-06-27 17:08:19 -0700 |
| commit | 7a147c1de99a7d03008d2921f091aa3de03a559f (patch) | |
| tree | b6ba5458267ea2ea5b26280058ea53d68fbec616 /indra/newview | |
| parent | c9da4d0a6dccbdcff228a5841d224463bc45297c (diff) | |
CHUI-146 : Fixed. Focus goes to first conversation in list when a conversation is dismissed.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llimfloater.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index b94a4048d4..9d3c0f98ce 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -628,9 +628,6 @@ LLIMFloater* LLIMFloater::getInstance(const LLUUID& session_id) void LLIMFloater::onClose(bool app_quitting) { - LLIMConversation::onClose(app_quitting); - - LLIMModel::LLIMSession* session = LLIMModel::instance().findIMSession( mSessionID); @@ -663,6 +660,8 @@ void LLIMFloater::onClose(bool app_quitting) // EXT-3516 X Button should end IM session, _ button should hide gIMMgr->leaveSession(mSessionID); + // Clean up the conversation *after* the session has been ended + LLIMConversation::onClose(app_quitting); } void LLIMFloater::setDocked(bool docked, bool pop_on_undock) |