diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-05-20 17:33:26 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-05-20 17:33:26 +0300 |
| commit | c3a352b219380faa722be6f1ac916a7b95eb836c (patch) | |
| tree | 0443963545a3ca7d86bdc1504da7d9375b850447 /indra/newview | |
| parent | f64049c5d8df7ca25a0412671863d1f619de9a66 (diff) | |
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
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvoicechannel.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
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; } |