diff options
author | Oz Linden <oz@lindenlab.com> | 2013-03-28 13:46:25 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-03-28 13:46:25 -0400 |
commit | effaca51841d6f07403b196a8d972861bb7e0f05 (patch) | |
tree | 9bebc2e9327bcdeb43b0651fdae6c889eb71a8f9 /indra/newview/llfloaterimsession.cpp | |
parent | f9ef7ba13a3ee008cb958c2852dff6c8f1073ee0 (diff) | |
parent | 130e4e510198147664a2377b62b22d8e42f00f04 (diff) |
merge changes for 3.5.0-beta6
Diffstat (limited to 'indra/newview/llfloaterimsession.cpp')
-rw-r--r-- | indra/newview/llfloaterimsession.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfloaterimsession.cpp b/indra/newview/llfloaterimsession.cpp index 73adfd0eda..6d5145f205 100644 --- a/indra/newview/llfloaterimsession.cpp +++ b/indra/newview/llfloaterimsession.cpp @@ -618,6 +618,8 @@ void LLFloaterIMSession::onClose(bool app_quitting) // Last change: // EXT-3516 X Button should end IM session, _ button should hide gIMMgr->leaveSession(mSessionID); + // *TODO: Study why we need to restore the floater before we close it. + // Might be because we want to save some state data in some clean open state. LLFloaterIMSessionTab::restoreFloater(); // Clean up the conversation *after* the session has been ended LLFloaterIMSessionTab::onClose(app_quitting); |