automated merge from trunk

1 files changed, 4 insertions, 1 deletions

diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h
index 2cc99d9e45..dce24ff541 100644
--- a/indra/newview/llvoiceclient.h
+++ b/indra/newview/llvoiceclient.h
@@ -109,6 +109,8 @@ public:
 	
 	virtual void updateSettings()=0; // call after loading settings and whenever they change
 	
+	virtual bool isVoiceWorking()=0; // connected to a voice server and voice channel
+
 	virtual const LLVoiceVersionInfo& getVersion()=0;
 	
 	/////////////////////
@@ -274,6 +276,8 @@ static const F32 OVERDRIVEN_POWER_LEVEL;
 
 	void updateSettings(); // call after loading settings and whenever they change
 
+	bool isVoiceWorking(); // connected to a voice server and voice channel
+
 	// tuning
 	void tuningStart();
 	void tuningStop();
@@ -397,7 +401,6 @@ static const F32 OVERDRIVEN_POWER_LEVEL;
 protected:
 	LLVoiceModuleInterface* mVoiceModule;
 	LLPumpIO *m_servicePump;
-	
 };