diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2014-06-26 12:08:26 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2014-06-26 12:08:26 +0300 |
| commit | f21ad12b376da6c82f79c61ff7d25b692da70d87 (patch) | |
| tree | 280c039c2b22eaf65550c578d8adcfe23703e454 /indra | |
| parent | 97be5b14a5c589feaad31a46f300469ae9e414cc (diff) | |
MAINT-2699 FIXED Don't change state of "Speak" toolbar button if voice is disabled.
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llvoiceclient.cpp | 10 |
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); } } |