From a1561c20e063060a6a54b4e66968404e4cb15d8a Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Thu, 20 Oct 2011 14:19:54 -0700
Subject: [PATCH] EXP-1433 FIX Speak button can be toggled while editing
Input/Output devices when voice is deactivated
---
indra/newview/llagent.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 21cb3380c9e..f8b204eca0e 100755
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -175,7 +175,9 @@ bool LLAgent::isActionAllowed(const LLSD& sdname)
}
else if (param == "speak")
{
- if ( gAgent.isVoiceConnected() && LLViewerParcelMgr::getInstance()->allowAgentVoice() )
+ if ( gAgent.isVoiceConnected() &&
+ LLViewerParcelMgr::getInstance()->allowAgentVoice() &&
+ ! LLVoiceClient::getInstance()->inTuningMode() )
{
retval = true;
}
--
GitLab