diff options
author | Merov Linden <merov@lindenlab.com> | 2013-03-15 17:57:48 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-03-15 17:57:48 -0700 |
commit | e8b22d3299e5e02f3349315fcf9e0166632e06c4 (patch) | |
tree | f0ae929e3bd76de83d41d7b286dfed15947e821d /indra/newview/llfloaterimsession.cpp | |
parent | 242c39f24bc38ee306f1a9b4a173fd095fdab49d (diff) | |
parent | 780fe4e37fe5df4120ef4de09e6fc69f6184e4d3 (diff) |
Pull merge from lindenlab/viewer-chui
Diffstat (limited to 'indra/newview/llfloaterimsession.cpp')
-rw-r--r-- | indra/newview/llfloaterimsession.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimsession.cpp b/indra/newview/llfloaterimsession.cpp index 50b2ed8c51..733678364e 100644 --- a/indra/newview/llfloaterimsession.cpp +++ b/indra/newview/llfloaterimsession.cpp @@ -618,7 +618,7 @@ void LLFloaterIMSession::onClose(bool app_quitting) // Last change: // EXT-3516 X Button should end IM session, _ button should hide gIMMgr->leaveSession(mSessionID); - + LLFloaterIMSessionTab::restoreFloater(); // Clean up the conversation *after* the session has been ended LLFloaterIMSessionTab::onClose(app_quitting); } |