diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-09-20 13:22:21 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-09-20 13:22:21 -0700 |
| commit | bb8820c70b6dc50524fa8e35a4a14b3cb66bf26c (patch) | |
| tree | b45831fc66318bd73ce303fb86bcf876673991c5 | |
| parent | f5fc2a9c3af23cc1aaf74e432eb3690d8d376d89 (diff) | |
CHUI-340 : WIP : Fix the event firing from LLSpeakerMgr to LLParticipantList
| -rw-r--r-- | indra/newview/llspeakers.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp index f50ae28421..2d2b5202e0 100644 --- a/indra/newview/llspeakers.cpp +++ b/indra/newview/llspeakers.cpp @@ -86,7 +86,7 @@ bool LLSpeaker::isInVoiceChannel() LLSpeakerUpdateSpeakerEvent::LLSpeakerUpdateSpeakerEvent(LLSpeaker* source) : LLEvent(source, "Speaker update speaker event"), -mSpeakerID (source->mID) + mSpeakerID (source->mID) { } @@ -387,8 +387,7 @@ void LLSpeakerMgr::update(BOOL resort_ok) { speakerp->mLastSpokeTime = mSpeechTimer.getElapsedTimeF32(); speakerp->mHasSpoken = TRUE; - llinfos << "Merov debug : LLSpeakerMgr::update, session = " << getSessionID() << ", uuid = " << speaker_id << ", date = " << LLFrameTimer::getElapsedSeconds() << llendl; - speakerp->fireEvent(new LLSpeakerUpdateSpeakerEvent(speakerp), "update_speaker"); + fireEvent(new LLSpeakerUpdateSpeakerEvent(speakerp), "update_speaker"); } speakerp->mStatus = LLSpeaker::STATUS_SPEAKING; // interpolate between active color and full speaking color based on power of speech output @@ -563,8 +562,7 @@ void LLSpeakerMgr::speakerChatted(const LLUUID& speaker_id) { speakerp->mLastSpokeTime = mSpeechTimer.getElapsedTimeF32(); speakerp->mHasSpoken = TRUE; - llinfos << "Merov debug : LLSpeakerMgr::speakerChatted, session = " << getSessionID() << ", uuid = " << speaker_id << ", date = " << LLFrameTimer::getElapsedSeconds() << llendl; - speakerp->fireEvent(new LLSpeakerUpdateSpeakerEvent(speakerp), "update_speaker"); + fireEvent(new LLSpeakerUpdateSpeakerEvent(speakerp), "update_speaker"); } } |