diff options
| author | Brian McGroarty <soft@lindenlab.com> | 2008-05-07 17:17:42 +0000 |
|---|---|---|
| committer | Brian McGroarty <soft@lindenlab.com> | 2008-05-07 17:17:42 +0000 |
| commit | e1e1212daae33723e7da325f295a5c3a6bb78979 (patch) | |
| tree | 95139904e71995519db2fc6e056940b2f40e73a3 /indra/newview/llvoiceclient.cpp | |
| parent | 41927004751731d2d0cb74989ded36878292ee4e (diff) | |
QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-7-sandbox-84884 -- dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index bba9fe1ccf..e61a6bddf8 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -218,6 +218,19 @@ void LLVivoxProtocolParser::reset() ignoringTags = false; accumulateText = false; textBuffer.clear(); + + energy = 0.f; + ignoreDepth = 0; + isChannel = false; + isEvent = false; + isLocallyMuted = false; + isModeratorMuted = false; + isSpeaking = false; + participantType = 0; + returnCode = 0; + state = 0; + statusCode = 0; + volume = 0; } //virtual @@ -1329,6 +1342,7 @@ void LLVoiceClient::stateMachine() fakeargv[i] = NULL; + fflush(NULL); // flush all buffers before the child inherits them pid_t id = vfork(); if(id == 0) { @@ -3018,7 +3032,7 @@ void LLVoiceClient::muteListChanged() ///////////////////////////// // Managing list of participants LLVoiceClient::participantState::participantState(const std::string &uri) : - mURI(uri), mPTT(false), mIsSpeaking(false), mIsModeratorMuted(false), mPower(0.0), mServiceType(serviceTypeUnknown), + mURI(uri), mPTT(false), mIsSpeaking(false), mIsModeratorMuted(false), mLastSpokeTimestamp(0.f), mPower(0.f), mVolume(0), mServiceType(serviceTypeUnknown), mOnMuteList(false), mUserVolume(100), mVolumeDirty(false), mAvatarIDValid(false) { } |