Automated merge

1 files changed, 4 insertions, 2 deletions

diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index 9f6c6232fd..59fec8b954 100644
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -261,7 +261,7 @@ protected:
 	public:
 		participantState(const std::string &uri);
 		
-		bool updateMuteState();
+	        bool updateMuteState();	// true if mute state has changed
 		bool isAvatar();
 		
 		std::string mURI;
@@ -271,13 +271,14 @@ protected:
 		LLFrameTimer mSpeakingTimeout;
 		F32	mLastSpokeTimestamp;
 		F32 mPower;
-		int mVolume;
+		F32 mVolume;
 		std::string mGroupID;
 		int mUserVolume;
 		bool mPTT;
 		bool mIsSpeaking;
 		bool mIsModeratorMuted;
 		bool mOnMuteList;		// true if this avatar is on the user's mute list (and should be muted)
+	       bool mVolumeSet;		// true if incoming volume messages should not change the volume
 		bool mVolumeDirty;		// true if this participant needs a volume command sent (either mOnMuteList or mUserVolume has changed)
 		bool mAvatarIDValid;
 		bool mIsSelf;
@@ -334,6 +335,7 @@ protected:
 		// Set to true when the mute state of someone in the participant list changes.
 		// The code will have to walk the list to find the changed participant(s).
 		bool		mVolumeDirty;
+	        bool		mMuteDirty;
 		
 		bool		mParticipantsChanged;
 		participantMap mParticipantsByURI;