From 7cec1f3381291ffbf4cc6a07daf4a74d5af5a9ee Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 4 Oct 2019 16:20:07 +0300
Subject: SL-6109 Added default key for voice

---
 indra/newview/llviewerinput.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llviewerinput.cpp')

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;
-- 
cgit v1.2.3