diff options
| author | Callum Prentice <callum@lindenlab.com> | 2010-04-02 14:57:12 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2010-04-02 14:57:12 -0700 |
| commit | 98e46e28e05c22c02da41603a056c0caf34f5ad0 (patch) | |
| tree | a24352a4ce377d91428554aab15f96f887b24514 /indra/llui/llcombobox.cpp | |
| parent | 9e1b600d9b41afea62b2ba68fa8d5bc5861d1111 (diff) | |
| parent | 2c5c563319d5ba8eaeae93b627536321956d347e (diff) | |
Merge with tip
Diffstat (limited to 'indra/llui/llcombobox.cpp')
| -rw-r--r-- | indra/llui/llcombobox.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp index 3a8efadaa4..cc107c972d 100644 --- a/indra/llui/llcombobox.cpp +++ b/indra/llui/llcombobox.cpp @@ -495,7 +495,6 @@ void LLComboBox::createLineEditor(const LLComboBox::Params& p) params.max_length_bytes(mMaxChars); params.commit_callback.function(boost::bind(&LLComboBox::onTextCommit, this, _2)); params.keystroke_callback(boost::bind(&LLComboBox::onTextEntry, this, _1)); - params.handle_edit_keys_directly(true); params.commit_on_focus_lost(false); params.follows.flags(FOLLOWS_ALL); params.label(mLabel); |