diff options
author | Loren Shih <seraph@lindenlab.com> | 2009-11-19 13:36:27 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2009-11-19 13:36:27 -0500 |
commit | afbc78d0398d58c44b2b1fb692ce1a27577fc4b1 (patch) | |
tree | da4c6c1bd6e87b81b10a5b7bed6429373e6a89eb /indra/newview/llsearchcombobox.cpp | |
parent | 6cea252986ef6d33f2e37333a286362b8e0272c5 (diff) | |
parent | 3e46ee6274d04d91657da92953b167fe94eb7f59 (diff) |
Merging viewer-2-0 changes into avatar-pipeline branch
--HG--
branch : avatar-pipeline
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)); } |