diff options
author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-06-22 11:08:36 +0300 |
---|---|---|
committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-06-22 11:08:36 +0300 |
commit | 21f19cb6f036787d93b186d6fcfd595ae6f03d87 (patch) | |
tree | aa09de906e9c2f9c30670e81498f93620c67d9b8 /indra/llui/llcombobox.cpp | |
parent | b0e5bee0b41e050e14d4e315ffa967ba43f96feb (diff) | |
parent | dc07de2f4a4c49d1877bf743b6f0d209392f6eb6 (diff) |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/llui/llcombobox.cpp')
-rw-r--r-- | indra/llui/llcombobox.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp index 559895da1a..00a933a0bb 100644 --- a/indra/llui/llcombobox.cpp +++ b/indra/llui/llcombobox.cpp @@ -845,6 +845,14 @@ void LLComboBox::setTextEntry(const LLStringExplicit& text) } } +void LLComboBox::setKeystrokeOnEsc(BOOL enable) +{ + if (mTextEntry) + { + mTextEntry->setKeystrokeOnEsc(enable); + } +} + void LLComboBox::onTextEntry(LLLineEditor* line_editor) { if (mTextEntryCallback != NULL) |