diff options
author | Glenn Glazer <coyot@lindenlab.com> | 2017-05-23 07:59:15 -0700 |
---|---|---|
committer | Glenn Glazer <coyot@lindenlab.com> | 2017-05-23 07:59:15 -0700 |
commit | 3fda9bea31327f166dd1067f7e5c9ce251b40289 (patch) | |
tree | d7bbf85ac5d6b15ed7d5db8b8b67a1cccbaca4f9 /indra/newview/llfloaterimnearbychat.cpp | |
parent | 4bf1f1d618d61f0cc2ec0dd22cea7d1c5b909b8f (diff) | |
parent | cf5865c6e2b27918b526431ccc4309bfc702534e (diff) |
pull from gate
Diffstat (limited to 'indra/newview/llfloaterimnearbychat.cpp')
-rw-r--r-- | indra/newview/llfloaterimnearbychat.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp index d18f03d8e9..7bf4516d8c 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) { |