summaryrefslogtreecommitdiff
path: root/indra/newview/llkeyconflict.cpp
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2019-10-04 16:20:07 +0300
committerandreykproductengine <andreykproductengine@lindenlab.com>2019-10-04 16:20:07 +0300
commitca56f6d953ad596d4fc02d8568ca542f57aa5119 (patch)
tree6eec2e884abe616bffa9e302361776ae2e9644b2 /indra/newview/llkeyconflict.cpp
parent6aab234105d6eed022afbea388ae21530c7e99dd (diff)
SL-6109 Added default key for voice
Diffstat (limited to 'indra/newview/llkeyconflict.cpp')
-rw-r--r--indra/newview/llkeyconflict.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llkeyconflict.cpp b/indra/newview/llkeyconflict.cpp
index 0b9aaea478..71ba0d37b3 100644
--- a/indra/newview/llkeyconflict.cpp
+++ b/indra/newview/llkeyconflict.cpp
@@ -480,6 +480,7 @@ void LLKeyConflictHandler::saveToSettings()
// Still write empty LLKeyData to make sure we will maintain UI position
if (data.mKey == KEY_NONE)
{
+ // Might be better idea to be consistent and use NONE. LLViewerInput can work with both cases
binding.key = "";
}
else