summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llvoiceclient.cpp18
1 files changed, 12 insertions, 6 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 56c0910983..5c125a236a 100755
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -657,19 +657,25 @@ void LLVoiceClient::keyDown(KEY key, MASK mask)
return;
}
- if(!mPTTIsMiddleMouse && LLAgent::isActionAllowed("speak"))
+ if (!mPTTIsMiddleMouse && LLAgent::isActionAllowed("speak") && (key == mPTTKey))
{
- bool down = (mPTTKey != KEY_NONE) && gKeyboard->getKeyDown(mPTTKey);
- if (down) { inputUserControlState(down); }
+ bool down = gKeyboard->getKeyDown(mPTTKey);
+ if (down)
+ {
+ inputUserControlState(down);
+ }
}
}
void LLVoiceClient::keyUp(KEY key, MASK mask)
{
- if(!mPTTIsMiddleMouse)
+ if (!mPTTIsMiddleMouse && (key == mPTTKey))
{
- bool down = (mPTTKey != KEY_NONE) && gKeyboard->getKeyDown(mPTTKey);
- if (down) { inputUserControlState(down); }
+ bool down = gKeyboard->getKeyDown(mPTTKey);
+ if (!down)
+ {
+ inputUserControlState(down);
+ }
}
}
void LLVoiceClient::middleMouseState(bool down)