merge

1 files changed, 33 insertions, 2 deletions

diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index c7ce92fff5..9d4af85c8c 100644
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -351,7 +351,7 @@ protected:
 		bool		mIsSpatial;	// True for spatial channels
 		bool		mIsP2P;
 		bool		mIncoming;
-		bool		mVoiceEnabled;
+		bool		mVoiceActive;
 		bool		mReconnect;	// Whether we should try to reconnect to this session if it's dropped
 
 		// Set to true when the volume/mute state of someone in the participant list changes.
@@ -953,7 +953,6 @@ protected:
 	int				ignoreDepth;
 	
 	// Members for processing responses. The values are transient and only valid within a call to processResponse().
-	bool			squelchDebugOutput;
 	int				returnCode;
 	int				statusCode;
 	std::string		statusString;
@@ -1039,5 +1038,37 @@ class LLVivoxSecurity :	public LLSingleton<LLVivoxSecurity>
     std::string     mAccountHandle;
 };
 
+class LLVoiceVivoxStats : public LLSingleton<LLVoiceVivoxStats>
+{
+    LLSINGLETON(LLVoiceVivoxStats);
+    LOG_CLASS(LLVoiceVivoxStats);
+    virtual ~LLVoiceVivoxStats();
+    
+  private:
+    F64SecondsImplicit mStartTime;
+
+    U32 mConnectCycles;
+
+    F64 mConnectTime;
+    U32 mConnectAttempts;
+    
+    F64 mProvisionTime;
+    U32 mProvisionAttempts;
+
+    F64 mEstablishTime;
+    U32 mEstablishAttempts;
+
+  public:
+
+    void reset();
+    void connectionAttemptStart();
+    void connectionAttemptEnd(bool success);
+    void provisionAttemptStart();
+    void provisionAttemptEnd(bool success);
+    void establishAttemptStart();
+    void establishAttemptEnd(bool success);
+    LLSD read();
+};
+
 #endif //LL_VIVOX_VOICE_CLIENT_H