diff options
| author | Bjoseph Wombat <bjoseph@vivox.com> | 2015-03-06 22:14:26 +0000 |
|---|---|---|
| committer | Bjoseph Wombat <bjoseph@vivox.com> | 2015-03-06 22:14:26 +0000 |
| commit | 98f98e03bdbfb8a9a9dd1004e15c589c3cfe7ccd (patch) | |
| tree | db3fa52caf36835b103af82e1c1fea4bc2681efb /indra/newview/llvoiceclient.cpp | |
| parent | 89690140c79dcbd8466ebd1c637f474670e3a7ce (diff) | |
More voice related changes to improve the user's experience.
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
| -rwxr-xr-x | indra/newview/llvoiceclient.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 962cdf0268..6df1bda135 100755 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -363,6 +363,7 @@ BOOL LLVoiceClient::isSessionCallBackPossible(const LLUUID& id) } } +/* obsolete BOOL LLVoiceClient::sendTextMessage(const LLUUID& participant_id, const std::string& message) { if (mVoiceModule) @@ -374,12 +375,13 @@ BOOL LLVoiceClient::sendTextMessage(const LLUUID& participant_id, const std::str return FALSE; } } +*/ void LLVoiceClient::endUserIMSession(const LLUUID& participant_id) { if (mVoiceModule) { - mVoiceModule->endUserIMSession(participant_id); + // mVoiceModule->endUserIMSession(participant_id); // A SLim leftover } } @@ -645,9 +647,8 @@ void LLVoiceClient::keyDown(KEY key, MASK mask) if(!mPTTIsMiddleMouse && LLAgent::isActionAllowed("speak")) { - bool down = (mPTTKey != KEY_NONE) - && gKeyboard->getKeyDown(mPTTKey); - inputUserControlState(down); + bool down = (mPTTKey != KEY_NONE) && gKeyboard->getKeyDown(mPTTKey); + if (down) { inputUserControlState(down); } } } @@ -655,9 +656,8 @@ void LLVoiceClient::keyUp(KEY key, MASK mask) { if(!mPTTIsMiddleMouse) { - bool down = (mPTTKey != KEY_NONE) - && gKeyboard->getKeyDown(mPTTKey); - inputUserControlState(down); + bool down = (mPTTKey != KEY_NONE) && gKeyboard->getKeyDown(mPTTKey); + if (down) { inputUserControlState(down); } } } void LLVoiceClient::middleMouseState(bool down) |