Merge

1 files changed, 4 insertions, 6 deletions

diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 815965fb0a..0bf373f478 100755
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -36,6 +36,7 @@
 #include "llsdserialize.h"
 #include "llui.h"
 #include "llkeyboard.h"
+#include "llagent.h"
 
 const F32 LLVoiceClient::OVERDRIVEN_POWER_LEVEL = 0.7f;
 
@@ -635,7 +636,7 @@ void LLVoiceClient::keyDown(KEY key, MASK mask)
 		return;
 	}
 	
-	if(!mPTTIsMiddleMouse)
+	if(!mPTTIsMiddleMouse && LLAgent::isActionAllowed("speak"))
 	{
 		bool down = (mPTTKey != KEY_NONE)
 		&& gKeyboard->getKeyDown(mPTTKey);
@@ -654,12 +655,9 @@ void LLVoiceClient::keyUp(KEY key, MASK mask)
 }
 void LLVoiceClient::middleMouseState(bool down)
 {
-	if(mPTTIsMiddleMouse)
+	if(mPTTIsMiddleMouse && LLAgent::isActionAllowed("speak"))
 	{
-        if(mPTTIsMiddleMouse)
-        {
-			inputUserControlState(down);
-        }		
+		inputUserControlState(down);
 	}
 }