From c3a352b219380faa722be6f1ac916a7b95eb836c Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Thu, 20 May 2010 17:33:26 +0300 Subject: EXT-7371 FIXED Improved new state handling in p2p Voice channel to process session leave event correctly. Reason: * when user leave a p2p voice session himself the session's voice channel is marked as "ignore next leave session event" * but when he re-starts the voice session the channel stays in "ignore next leave session event" state. So, when an other p2p participant ends call this voice channel is not deactivated because of this flag. Fix: reset "ignore next leave session event" flag to FALSE when viewer is joining p2p voice session. Reviewed by Aimee Walton at https://codereview.productengine.com/secondlife/r/418/ --HG-- branch : product-engine --- indra/newview/llvoicechannel.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra') diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp index 25b46f8e55..1b4471a9fe 100644 --- a/indra/newview/llvoicechannel.cpp +++ b/indra/newview/llvoicechannel.cpp @@ -791,6 +791,12 @@ void LLVoiceChannelP2P::handleStatusChange(EStatusType type) } mIgnoreNextSessionLeave = FALSE; return; + case STATUS_JOINING: + // because we join session we expect to process session leave event in the future. EXT-7371 + // may be this should be done in the LLVoiceChannel::handleStatusChange. + mIgnoreNextSessionLeave = FALSE; + break; + default: break; } -- cgit v1.2.3