diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-24 08:57:27 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-24 08:57:27 +0000 |
| commit | a7bca7055adbceee0fe09a6078158ffe8d0eacef (patch) | |
| tree | 4facac85effad80ad3d185794edc2ae90bddac1e /indra/llui/llscrolllistctrl.h | |
| parent | 245fe3edc6fa7333c16efcc90a4a52db8450a828 (diff) | |
| parent | 1d45b1edcd3570b27622c0e99cf0bd5aee331cc1 (diff) | |
PE merge. Conflict resolved.
Diffstat (limited to 'indra/llui/llscrolllistctrl.h')
| -rw-r--r-- | indra/llui/llscrolllistctrl.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llui/llscrolllistctrl.h b/indra/llui/llscrolllistctrl.h index 1983891649..e819c5fdea 100644 --- a/indra/llui/llscrolllistctrl.h +++ b/indra/llui/llscrolllistctrl.h @@ -96,8 +96,6 @@ public: }; - //typedef boost::signals2::signal<void (S32,const LLScrollListItem*,const LLScrollListItem*),maximum<S32>> sort_signal_t; - //typedef boost::signals2::signal<void (S32,const LLScrollListItem*,const LLScrollListItem*)> sort_signal_t; typedef boost::signals2::signal<S32 (S32,const LLScrollListItem*,const LLScrollListItem*),maximum<S32> > sort_signal_t; struct Params : public LLInitParam::Block<Params, LLUICtrl::Params> |