diff options
| author | Sergei Litovchuk <slitovchuk@productengine.com> | 2010-02-24 18:26:16 +0200 |
|---|---|---|
| committer | Sergei Litovchuk <slitovchuk@productengine.com> | 2010-02-24 18:26:16 +0200 |
| commit | 280671ce4ad1d2a352acdcd91746dd6382be5ff2 (patch) | |
| tree | a86daef4c9954a29205c84fa1dd5e1b48f7ca30e /indra/newview/lllocationinputctrl.cpp | |
| parent | e40f22116762ddc629a8efb2057c81e6ffde3a99 (diff) | |
Fixed major bug (EXT-5657) Location input becomes empty if press Ctrl+C.
- Added check for pressed Ctrl button.
--HG--
branch : product-engine
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) |