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/lltoolpipette.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/lltoolpipette.h')
| -rw-r--r-- | indra/newview/lltoolpipette.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltoolpipette.h b/indra/newview/lltoolpipette.h index fcccafe1a4..533e8a7c95 100644 --- a/indra/newview/lltoolpipette.h +++ b/indra/newview/lltoolpipette.h @@ -41,7 +41,7 @@ #include "lltool.h" #include "lltextureentry.h" #include <boost/function.hpp> -#include <boost/signal.hpp> +#include <boost/signals2.hpp> class LLViewerObject; class LLPickInfo; @@ -59,7 +59,7 @@ public: virtual BOOL handleToolTip(S32 x, S32 y, std::string& msg, LLRect *sticky_rect_screen); // Note: Don't return connection; use boost::bind + boost::signal::trackable to disconnect slots - typedef boost::signal<void (const LLTextureEntry& te)> signal_t; + typedef boost::signals2::signal<void (const LLTextureEntry& te)> signal_t; void setToolSelectCallback(const signal_t::slot_type& cb) { mSignal.connect(cb); } void setResult(BOOL success, const std::string& msg); |