diff options
| author | Richard Linden <none@none> | 2010-03-09 12:27:41 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-03-09 12:27:41 -0800 |
| commit | 76f6dba9e4a34a34c5100807f685790ad6f5129b (patch) | |
| tree | c89eaa69569d74a26a8fd73b230856be45b6ab6d | |
| parent | fe8ec78a6b9d0e002dbd8d3db633344e112f46ab (diff) | |
fixed bad merge
| -rw-r--r-- | indra/llui/llcombobox.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h index 4f27588467..82134c4ffe 100644 --- a/indra/llui/llcombobox.h +++ b/indra/llui/llcombobox.h @@ -230,6 +230,7 @@ private: commit_callback_t mPrearrangeCallback; commit_callback_t mTextEntryCallback; commit_callback_t mSelectionCallback; + boost::signals2::connection mTopLostSignalConnection; S32 mLastSelectedIndex; }; #endif |