summaryrefslogtreecommitdiff
path: root/indra/llui/llcombobox.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-04-02 12:32:56 -0400
committerLoren Shih <seraph@lindenlab.com>2010-04-02 12:32:56 -0400
commit873de2daae04a63c796661ff6d4db6aa912041bf (patch)
tree1e44c8c87fc8c86013a8843c572ec6fac4409eab /indra/llui/llcombobox.cpp
parent580ecaefcac2eb928c3dbdc9240e3fb54f3c989f (diff)
parenta7085418df1ada6e19b94b6df772ed21e663d119 (diff)
automated merge
Diffstat (limited to 'indra/llui/llcombobox.cpp')
-rw-r--r--indra/llui/llcombobox.cpp1
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);