diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-11-19 09:28:35 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-19 09:28:35 -0800 |
commit | 51e640e5d753ac9dc005cd6827db77988a04b8fa (patch) | |
tree | 85cb5fc6626626b42df6a425a0663a515ac5362c /indra/newview/llsearchcombobox.cpp | |
parent | d4ba73ed721fa0811474fc53300f560539d38018 (diff) | |
parent | 3e46ee6274d04d91657da92953b167fe94eb7f59 (diff) |
Merge from remote repo
Diffstat (limited to 'indra/newview/llsearchcombobox.cpp')
-rw-r--r-- | indra/newview/llsearchcombobox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsearchcombobox.cpp b/indra/newview/llsearchcombobox.cpp index f95671685b..93a70b6471 100644 --- a/indra/newview/llsearchcombobox.cpp +++ b/indra/newview/llsearchcombobox.cpp @@ -82,7 +82,7 @@ LLSearchComboBox::LLSearchComboBox(const Params&p) setButtonVisible(p.dropdown_button_visible); mTextEntry->setCommitCallback(boost::bind(&LLComboBox::onTextCommit, this, _2)); mTextEntry->setKeystrokeCallback(boost::bind(&LLComboBox::onTextEntry, this, _1), NULL); - setSelectionCallback(boost::bind(&LLSearchComboBox::onSelectionCommit, this)); + setCommitCallback(boost::bind(&LLSearchComboBox::onSelectionCommit, this)); setPrearrangeCallback(boost::bind(&LLSearchComboBox::onSearchPrearrange, this, _2)); mSearchButton->setCommitCallback(boost::bind(&LLSearchComboBox::onTextCommit, this, _2)); } |