diff options
| author | Palmer Truelson <palmer@lindenlab.com> | 2009-11-25 09:42:58 -0800 |
|---|---|---|
| committer | Palmer Truelson <palmer@lindenlab.com> | 2009-11-25 09:42:58 -0800 |
| commit | bb614fa887ec7cadc5b370c1dcf412ae5cf662e1 (patch) | |
| tree | 2ee594428704e0f4774f717d71485ee0bdde8748 /indra/llui/llcombobox.cpp | |
| parent | 6d66910c6e2fbb25bf8b5c7b90e795f350342104 (diff) | |
| parent | 57bc7dc44f31ef132a4abec228459c490c425eed (diff) | |
Merge of viewer 2
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) |