From 26809498db128f2f69da3d04ae2b736f78f6e13a Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 5 Apr 2017 14:29:35 +0300
Subject: MAINT-3595 Add the ability to turn off auto-complete of gestures in
local chat
---
indra/newview/app_settings/settings.xml | 11 +++++++++++
indra/newview/llfloaterimnearbychat.cpp | 3 ++-
.../newview/skins/default/xui/en/panel_preferences_chat.xml | 12 ++++++++++++
3 files changed, 25 insertions(+), 1 deletion(-)
(limited to 'indra/newview')
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index db2d48bd12..c086e71fae 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1619,6 +1619,17 @@
<key>Value</key>
<string>default</string>
</map>
+ <key>ChatAutocompleteGestures</key>
+ <map>
+ <key>Comment</key>
+ <string>Auto-complete gestures in nearby chat</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
<key>ChatBarStealsFocus</key>
<map>
<key>Comment</key>
diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp
index 40ae22bb4e..7895a5ff48 100644
--- a/indra/newview/llfloaterimnearbychat.cpp
+++ b/indra/newview/llfloaterimnearbychat.cpp
@@ -485,7 +485,8 @@ void LLFloaterIMNearbyChat::onChatBoxKeystroke()
KEY key = gKeyboard->currentKey();
// Ignore "special" keys, like backspace, arrows, etc.
- if (length > 1
+ if (gSavedSettings.getBOOL("ChatAutocompleteGestures")
+ && length > 1
&& raw_text[0] == '/'
&& key < KEY_SPECIAL)
{
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 440c6613d5..78f771cd51 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -9,6 +9,18 @@
name="chat"
top="1"
width="517">
+
+ <check_box
+ control_name="ChatAutocompleteGestures"
+ height="16"
+ initial_value="true"
+ label="Auto-complete gestures in nearby chat"
+ layout="topleft"
+ top="17"
+ left="13"
+ name="auto_complete_gestures"
+ width="330">
+ </check_box>
<panel
border="false"
--
cgit v1.2.3