diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-04 10:22:28 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-04 10:22:28 -0500 |
| commit | 76cf7ebf7037c2e579861c64c38fc24bde165669 (patch) | |
| tree | 72152ff4ae4cb5f6422cd8c4c9830b4f76c3aa21 /indra/newview/llcallfloater.cpp | |
| parent | d2d192060993d938a2fd131f8872a60b678e4a04 (diff) | |
| parent | 9a15ee8a91a12020b22625873c280837739f946c (diff) | |
merge
Diffstat (limited to 'indra/newview/llcallfloater.cpp')
| -rw-r--r-- | indra/newview/llcallfloater.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp index 8cb240c7c2..bd4fae6ab6 100644 --- a/indra/newview/llcallfloater.cpp +++ b/indra/newview/llcallfloater.cpp @@ -678,7 +678,8 @@ void LLCallFloater::resetVoiceRemoveTimers() void LLCallFloater::removeVoiceRemoveTimer(const LLUUID& voice_speaker_id) { - mSpeakerDelayRemover->unsetActionTimer(voice_speaker_id); + bool delete_it = true; + mSpeakerDelayRemover->unsetActionTimer(voice_speaker_id, delete_it); } bool LLCallFloater::validateSpeaker(const LLUUID& speaker_id) |