diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-12-14 17:49:25 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-12-14 17:49:25 -0800 |
| commit | e8bff548ff7374c263c2bc38a337e8841bc2761f (patch) | |
| tree | 7f2e6705d79a504925fc7c3e799cd81d85ee4240 /indra/newview/llfloaterimsession.cpp | |
| parent | fa822a2ae50f8d070da19c64b3b3c03643d7c8b2 (diff) | |
| parent | ba8d9afe17a5eb75b7c89b6a1400e412bb473379 (diff) | |
Pull and merge from ssh://stinson@hg.lindenlab.com/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); |
