diff options
| author | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-11-15 10:38:21 +0200 |
|---|---|---|
| committer | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-11-15 10:38:21 +0200 |
| commit | dbc37f6ca74dba6c6d5194e0397d5cfe6f570c1d (patch) | |
| tree | 805d12e4dc646f8bce329dc9913e1239f334b438 /indra/newview/llspeakers.cpp | |
| parent | d75824d520ba1965e48196f8b230ded0f15c5841 (diff) | |
CHUI-397 (Delay in removing names from participant list in nearby chat)
CHUI-440 (Nearby chat participant list does not clear after teleport when conversation floater is closed/minimized)
fixed
Diffstat (limited to 'indra/newview/llspeakers.cpp')
| -rw-r--r-- | indra/newview/llspeakers.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp index 5036334bdd..88f29d7587 100644 --- a/indra/newview/llspeakers.cpp +++ b/indra/newview/llspeakers.cpp @@ -254,6 +254,10 @@ bool LLSpeakersDelayActionsStorage::onTimerActionCallback(const LLUUID& speaker_ return true; } +bool LLSpeakersDelayActionsStorage::isTimerStarted(const LLUUID& speaker_id) +{ + return (mActionTimersMap.size() > 0) && (mActionTimersMap.find(speaker_id) != mActionTimersMap.end()); +} // // ModerationResponder @@ -603,6 +607,10 @@ const LLUUID LLSpeakerMgr::getSessionID() return mVoiceChannel->getSessionID(); } +bool LLSpeakerMgr::isSpeakerToBeRemoved(const LLUUID& speaker_id) +{ + return mSpeakerDelayRemover && mSpeakerDelayRemover->isTimerStarted(speaker_id); +} void LLSpeakerMgr::setSpeakerTyping(const LLUUID& speaker_id, BOOL typing) { |