summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimsession.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-03-28 10:12:18 -0400
committerOz Linden <oz@lindenlab.com>2013-03-28 10:12:18 -0400
commit130e4e510198147664a2377b62b22d8e42f00f04 (patch)
tree14556a65468e06edcbf6f68c4b026fea16fcd070 /indra/newview/llfloaterimsession.cpp
parent515f0e5a559ff3f0cb7d02e1d40b0f71425800ea (diff)
parentcf1747712b154b6984cf374cf9c86f68a1210fb3 (diff)
merge changes for 3.5.0-beta6
Diffstat (limited to 'indra/newview/llfloaterimsession.cpp')
-rw-r--r--indra/newview/llfloaterimsession.cpp2
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);