summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerinput.cpp
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2019-10-04 16:20:07 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-06-23 14:50:02 +0300
commit7cec1f3381291ffbf4cc6a07daf4a74d5af5a9ee (patch)
tree30aeb51bf67bfdbedbe92ea01d8400ed2a126a0f /indra/newview/llviewerinput.cpp
parente211372923bed31e632bc9825913d3d57cdc2d52 (diff)
SL-6109 Added default key for voice
Diffstat (limited to 'indra/newview/llviewerinput.cpp')
-rw-r--r--indra/newview/llviewerinput.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llviewerinput.cpp b/indra/newview/llviewerinput.cpp
index 02d0dcb6c7..2327ac7f4c 100644
--- a/indra/newview/llviewerinput.cpp
+++ b/indra/newview/llviewerinput.cpp
@@ -1198,10 +1198,11 @@ S32 LLViewerInput::loadBindingMode(const LLViewerInput::KeyMode& keymode, S32 mo
++it)
{
bool processed = false;
- if (!it->key.getValue().empty())
+ std::string key_str = it->key.getValue();
+ if (!key_str.empty() && key_str != "NONE")
{
KEY key;
- LLKeyboard::keyFromString(it->key, &key);
+ LLKeyboard::keyFromString(key_str, &key);
if (key != KEY_NONE)
{
MASK mask;