diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-05-08 21:08:08 +0000 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-05-08 21:08:08 +0000 |
| commit | 3800c0df910c83e987184d541b868168fc2b5bec (patch) | |
| tree | 91bcf4e13972ae02b9d6500c1d14de7bb8d37dc4 /indra/newview/llfolderview.h | |
| parent | 5da967dc744f35d5270c7cb0b8b23b993ecda3e1 (diff) | |
svn merge -r114679:114681 svn+ssh://svn.lindenlab.com/svn/linden/branches/event-system/event-system-7 svn+ssh://svn.lindenlab.com/svn/linden/branches/event-system/event-system-8
Diffstat (limited to 'indra/newview/llfolderview.h')
| -rw-r--r-- | indra/newview/llfolderview.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h index 1b128d84ee..d8eb9008f0 100644 --- a/indra/newview/llfolderview.h +++ b/indra/newview/llfolderview.h @@ -763,7 +763,7 @@ public: void setFilterPermMask(PermissionMask filter_perm_mask) { mFilter.setFilterPermissions(filter_perm_mask); } void setAllowMultiSelect(BOOL allow) { mAllowMultiSelect = allow; } - typedef boost::signal<void (const std::deque<LLFolderViewItem*>& items, BOOL user_action)> signal_t; + typedef boost::signals2::signal<void (const std::deque<LLFolderViewItem*>& items, BOOL user_action)> signal_t; void setSelectCallback(const signal_t::slot_type& cb) { mSelectSignal.connect(cb); } LLInventoryFilter* getFilter() { return &mFilter; } |