diff options
| author | Dave Parks <davep@lindenlab.com> | 2009-11-24 23:21:57 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2009-11-24 23:21:57 -0600 |
| commit | e264f00c833805e1f813bc1d0b2cfd7a1bf7b272 (patch) | |
| tree | 1a64a520502d2ed2c7dadc2316e543ae9e9a91d2 /indra/newview/llsearchcombobox.cpp | |
| parent | c9e153c182dae9472a2b87cddfec8c47b30b06b9 (diff) | |
| parent | 5b5354c933aa7b1ceeb307853c24fba28d4e31bf (diff) | |
Merge
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)); } |