diff options
author | Merov Linden <merov@lindenlab.com> | 2012-12-14 21:26:02 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-12-14 21:26:02 -0800 |
commit | f8b51f40289255ce38f65830f5bb0f29def3b757 (patch) | |
tree | 43712a7aa38e35d297eba4c74eaa7f03930f777c /indra/newview/llfloaterimsession.cpp | |
parent | d0d8ee87e7648e80b83b125202d6270495e955b6 (diff) | |
parent | ba8d9afe17a5eb75b7c89b6a1400e412bb473379 (diff) |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llfloaterimsession.cpp')
-rw-r--r-- | indra/newview/llfloaterimsession.cpp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/indra/newview/llfloaterimsession.cpp b/indra/newview/llfloaterimsession.cpp index 3001029968..a0ca7286f1 100644 --- a/indra/newview/llfloaterimsession.cpp +++ b/indra/newview/llfloaterimsession.cpp @@ -102,6 +102,24 @@ void LLFloaterIMSession::refresh() } // virtual +void LLFloaterIMSession::onTearOffClicked() +{ + LLFloaterIMSessionTab::onTearOffClicked(); + + if(mIsP2PChat) + { + if(isTornOff()) + { + mSpeakingIndicator->setSpeakerId(mOtherParticipantUUID, mSessionID); + } + else + { + mSpeakingIndicator->setSpeakerId(LLUUID::null); + } + } +} + +// virtual void LLFloaterIMSession::onClickCloseBtn() { LLIMModel::LLIMSession* session = LLIMModel::instance().findIMSession(mSessionID); |