diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-03-27 16:08:03 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-03-27 16:08:03 -0700 |
| commit | 9f819806cd0a2301c83a866d06594ce7b2f3c3d5 (patch) | |
| tree | ffef8148c674f0c02e02518d0f65a49c7cb68aa1 /indra | |
| parent | 9adb105999b25f239e4fc92daa249cc9a686790f (diff) | |
CHUI-901 : Fixed! Do touch torn off state in restoreFloater()
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloaterimsession.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llfloaterimsessiontab.cpp | 3 |
2 files changed, 3 insertions, 2 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); diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp index 64c1f50074..5083331167 100644 --- a/indra/newview/llfloaterimsessiontab.cpp +++ b/indra/newview/llfloaterimsessiontab.cpp @@ -880,9 +880,8 @@ void LLFloaterIMSessionTab::reshapeFloater(bool collapse) void LLFloaterIMSessionTab::restoreFloater() { - if(checkIfTornOff() && !isMessagePaneExpanded()) + if(!isMessagePaneExpanded()) { - if(isMinimized()) { setMinimized(false); |