diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-29 16:46:06 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-29 16:46:06 +0200 |
commit | db4e46e93d06c03520cb7c781b8e41b6d374414d (patch) | |
tree | 05bbd6186f1008afec9baae673a8e8126d2573ad /indra/newview/llvoiceclient.cpp | |
parent | d66d9afae1c7cd4484b72532c0103ce7a4db9e77 (diff) | |
parent | 53173419000ba1d14aa99c59353e91f700915e07 (diff) |
Mere from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
-rw-r--r-- | indra/newview/llvoiceclient.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 02a2d8c8cf..560c2ab469 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -294,8 +294,14 @@ void LLVivoxProtocolParser::reset() ignoringTags = false; accumulateText = false; energy = 0.f; + hasText = false; + hasAudio = false; + hasVideo = false; + terminated = false; ignoreDepth = 0; isChannel = false; + incoming = false; + enabled = false; isEvent = false; isLocallyMuted = false; isModeratorMuted = false; @@ -6406,6 +6412,7 @@ void LLVoiceClient::filePlaybackSetMode(bool vox, float speed) } LLVoiceClient::sessionState::sessionState() : + mErrorStatusCode(0), mMediaStreamState(streamStateUnknown), mTextStreamState(streamStateUnknown), mCreateInProgress(false), |