diff options
author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-10-04 16:20:07 +0300 |
---|---|---|
committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-10-04 16:20:07 +0300 |
commit | ca56f6d953ad596d4fc02d8568ca542f57aa5119 (patch) | |
tree | 6eec2e884abe616bffa9e302361776ae2e9644b2 /indra/newview/llviewerinput.cpp | |
parent | 6aab234105d6eed022afbea388ae21530c7e99dd (diff) |
SL-6109 Added default key for voice
Diffstat (limited to 'indra/newview/llviewerinput.cpp')
-rw-r--r-- | indra/newview/llviewerinput.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llviewerinput.cpp b/indra/newview/llviewerinput.cpp index 95c26cdde2..fda521933f 100644 --- a/indra/newview/llviewerinput.cpp +++ b/indra/newview/llviewerinput.cpp @@ -1196,10 +1196,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; |