diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-28 12:58:01 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-28 12:58:01 +0100 |
commit | 394effa63670a8c44d94fe9be2f71e294a292414 (patch) | |
tree | ba31e829f216b64207d2afc39a3991f0d7ce847c /indra/newview/llvoicevivox.cpp | |
parent | 99ec1f3a61334e2508c82d6ae803974c7714ed1e (diff) | |
parent | 7e0b36d6102f5e285296cd8e0dc6961b5c73c7cb (diff) |
merge from viewer-public
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
-rw-r--r-- | indra/newview/llvoicevivox.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 1597691347..c6c155f0f0 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -4088,7 +4088,9 @@ LLVivoxVoiceClient::participantState::participantState(const std::string &uri) : mLastSpokeTimestamp(0.f), mPower(0.f), mVolume(LLVoiceClient::VOLUME_DEFAULT), + mUserVolume(0), mOnMuteList(false), + mVolumeSet(false), mVolumeDirty(false), mAvatarIDValid(false), mIsSelf(false) @@ -5538,6 +5540,7 @@ LLVivoxVoiceClient::sessionState::sessionState() : mVoiceEnabled(false), mReconnect(false), mVolumeDirty(false), + mMuteDirty(false), mParticipantsChanged(false) { } |