summaryrefslogtreecommitdiff
path: root/indra/newview/llsearchcombobox.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2009-11-18 15:30:40 -0500
committerLoren Shih <seraph@lindenlab.com>2009-11-18 15:30:40 -0500
commit3ac552c5048c13bc2912d25877728a057b195300 (patch)
tree009225c01efdd39ac488b90d2df67ebbc47a8df4 /indra/newview/llsearchcombobox.cpp
parent5dea0791f7087f2ce2bbe2bdce49d62f1a6f1f92 (diff)
parent1875d5e37ba1591ba9b75014a7618f38427f0d2f (diff)
merge
Diffstat (limited to 'indra/newview/llsearchcombobox.cpp')
-rw-r--r--indra/newview/llsearchcombobox.cpp2
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));
}