diff options
author | angela <angela@lindenlab.com> | 2009-11-19 11:43:47 +0800 |
---|---|---|
committer | angela <angela@lindenlab.com> | 2009-11-19 11:43:47 +0800 |
commit | 6e5f529a7adb53fa021986aed6e6b1b229cc0efd (patch) | |
tree | a031044cfb6618a5b36a0e80d0fc3a918dfa07a9 /indra/llui/llcombobox.cpp | |
parent | a35fbddb910fa0dd068622c3dc64af1b27ca19b7 (diff) | |
parent | 81eca4a7823f7fa06327b8185b6603d1f3c9ac9a (diff) |
branch merge
Diffstat (limited to 'indra/llui/llcombobox.cpp')
-rw-r--r-- | indra/llui/llcombobox.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp index 803978bfa2..f29e8785eb 100644 --- a/indra/llui/llcombobox.cpp +++ b/indra/llui/llcombobox.cpp @@ -102,7 +102,6 @@ LLComboBox::LLComboBox(const LLComboBox::Params& p) mMaxChars(p.max_chars), mPrearrangeCallback(p.prearrange_callback()), mTextEntryCallback(p.text_entry_callback()), - mSelectionCallback(p.selection_callback()), mListPosition(p.list_position), mLastSelectedIndex(-1) { @@ -721,12 +720,6 @@ void LLComboBox::onItemSelected(const LLSD& data) // commit does the reverse, asserting the value in the list onCommit(); - - // call the callback if it exists - if(mSelectionCallback) - { - mSelectionCallback(this, data); - } } BOOL LLComboBox::handleToolTip(S32 x, S32 y, MASK mask) |