livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-6304 FIXED Push-to-talk triggered with keyboard doesn't close the mic

meow-7.2.2
AndreyL ProductEngine 2016-04-06 01:34:21 +03:00
parent 2907cfa6f1
commit afcea0b8dc
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/llvoiceclient.cpp
View File

@ -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)