diff options
| author | callum <none@none> | 2011-10-20 14:19:54 -0700 |
|---|---|---|
| committer | callum <none@none> | 2011-10-20 14:19:54 -0700 |
| commit | a1561c20e063060a6a54b4e66968404e4cb15d8a (patch) | |
| tree | c6f24b7d2415f228af0c9d61b3c6d299d054fa8d /indra | |
| parent | aa3f5edc83a6a20f0473fff6f28fdad6f5406dc2 (diff) | |
EXP-1433 FIX Speak button can be toggled while editing Input/Output devices when voice is deactivated
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llagent.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 21cb3380c9..f8b204eca0 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; } |