diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-02-24 23:41:22 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-02-24 23:41:22 -0600 |
| commit | 625dd5ead25a71cceb2973192438ae9442ed73d1 (patch) | |
| tree | 142a6613f77f6b725dd99e59ef771fefb34cf127 /indra/newview/lllocationinputctrl.cpp | |
| parent | 64d83571c9596900f32d0af63c2dd9968badb82f (diff) | |
| parent | f71098a4065896bd69fcfe55c83dd3a562a7ac64 (diff) | |
Merge with viewer-2-0
Diffstat (limited to 'indra/newview/lllocationinputctrl.cpp')
| -rw-r--r-- | indra/newview/lllocationinputctrl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp index bdd4426636..5f233bece0 100644 --- a/indra/newview/lllocationinputctrl.cpp +++ b/indra/newview/lllocationinputctrl.cpp @@ -473,6 +473,7 @@ BOOL LLLocationInputCtrl::handleKeyHere(KEY key, MASK mask) void LLLocationInputCtrl::onTextEntry(LLLineEditor* line_editor) { KEY key = gKeyboard->currentKey(); + MASK mask = gKeyboard->currentMask(TRUE); if (line_editor->getText().empty()) { @@ -480,7 +481,7 @@ void LLLocationInputCtrl::onTextEntry(LLLineEditor* line_editor) hideList(); } // Typing? (moving cursor should not affect showing the list) - else if (key != KEY_LEFT && key != KEY_RIGHT && key != KEY_HOME && key != KEY_END) + else if (mask != MASK_CONTROL && key != KEY_LEFT && key != KEY_RIGHT && key != KEY_HOME && key != KEY_END) { prearrangeList(line_editor->getText()); if (mList->getItemCount() != 0) |