diff options
| author | graham linden <graham@lindenlab.com> | 2013-03-28 19:16:48 -0700 |
|---|---|---|
| committer | graham linden <graham@lindenlab.com> | 2013-03-28 19:16:48 -0700 |
| commit | 14ddfcdf5237c9529d8a8edbd4c86cfd53cfaf78 (patch) | |
| tree | 60f4de9fcd1b22b8dd504218a870e8abea599a81 /indra/newview/llfloaterimsession.cpp | |
| parent | d4b3c23da11dd963915d078b169ac9ac0cf7b7bf (diff) | |
| parent | 130e4e510198147664a2377b62b22d8e42f00f04 (diff) | |
Merged lindenlab/viewer-development into default
Diffstat (limited to 'indra/newview/llfloaterimsession.cpp')
| -rw-r--r-- | indra/newview/llfloaterimsession.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimsession.cpp b/indra/newview/llfloaterimsession.cpp index 50b2ed8c51..6d5145f205 100644 --- a/indra/newview/llfloaterimsession.cpp +++ b/indra/newview/llfloaterimsession.cpp @@ -618,7 +618,9 @@ 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); } @@ -892,6 +894,11 @@ void LLFloaterIMSession::onInputEditorFocusLost(LLFocusableElement* caller, void void LLFloaterIMSession::onInputEditorKeystroke(LLTextEditor* caller, void* userdata) { LLFloaterIMSession* self = (LLFloaterIMSession*)userdata; + LLFloaterIMContainer* im_box = LLFloaterIMContainer::findInstance(); + if (im_box) + { + im_box->flashConversationItemWidget(self->mSessionID,false); + } std::string text = self->mInputEditor->getText(); // Deleting all text counts as stopping typing. |