diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 18:24:07 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 18:24:07 -0800 |
| commit | 9b05fecbf6b3d65dae5a010fc35821dc116a44d0 (patch) | |
| tree | 9c0df85bb3a8b5c4e58655179e1b29ee31594cfc /indra/newview/llvoicevivox.cpp | |
| parent | 5ed6e0720af1b6cdf1a983e2c040eeb5d8ae33ba (diff) | |
| parent | db4e46e93d06c03520cb7c781b8e41b6d374414d (diff) | |
automated merge from trunk
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 232171cab6..a1bfda1e2a 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -5493,6 +5493,7 @@ void LLVivoxVoiceClient::filePlaybackSetMode(bool vox, float speed) } LLVivoxVoiceClient::sessionState::sessionState() : + mErrorStatusCode(0), mMediaStreamState(streamStateUnknown), mTextStreamState(streamStateUnknown), mCreateInProgress(false), @@ -6230,8 +6231,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; |