diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-01-04 15:33:56 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-01-04 15:33:56 +0200 |
| commit | e673fdea3f9e6a3e48736461e00fd8bb1f2a2876 (patch) | |
| tree | cb856fe477eb7a9daa56cfbed1bfe3747cf9a276 | |
| parent | dcf144eae0b52c24168bde4d1cfedeb275a9777a (diff) | |
Fixed low bug EXT-3897 ( Turn off log spam: "LLIMModel::getSpeakerManager: session 00000000-0000-0000-0000-000000000000does not exist" from Voice Client)
-- added check of session UUID to null before calling LLIMModel::getSpeakerManager (implemented for the EXT-3544 bug)
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llimview.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 40227539d0..b9af49a50d 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -781,7 +781,7 @@ LLIMSpeakerMgr* LLIMModel::getSpeakerManager( const LLUUID& session_id ) const LLIMSession* session = findIMSession(session_id); if (!session) { - llwarns << "session " << session_id << "does not exist " << llendl; + llwarns << "session " << session_id << " does not exist " << llendl; return NULL; } diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 899cc35238..423c46e14c 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -4445,7 +4445,7 @@ void LLVoiceClient::participantUpdatedEvent( participant->mVolume = volume; - // *HACH: mantipov: added while working on EXT-3544 + // *HACK: mantipov: added while working on EXT-3544 /* Sometimes LLVoiceClient::participantUpdatedEvent callback is called BEFORE LLViewerChatterBoxSessionAgentListUpdates::post() sometimes AFTER. @@ -4462,7 +4462,9 @@ void LLVoiceClient::participantUpdatedEvent( in LLCallFloater::draw() */ LLVoiceChannel* voice_cnl = LLVoiceChannel::getCurrentVoiceChannel(); - if (voice_cnl) + + // ignore session ID of local chat + if (voice_cnl && voice_cnl->getSessionID().notNull()) { LLSpeakerMgr* speaker_manager = LLIMModel::getInstance()->getSpeakerManager(voice_cnl->getSessionID()); if (speaker_manager) |