diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2009-06-04 16:24:21 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2009-06-04 16:24:21 +0000 |
| commit | 087bd265534b8e3086ae1af441a9cf0eb7c684df (patch) | |
| tree | a0c911515476d4ac4aac9bd984de28eb7573a478 /indra/llui/llui.h | |
| parent | f9b9372027a41900ad572afcd7ea0d2cc5489b8f (diff) | |
Merge of QAR-1383 event-system-7 into trunk.
svn merge -r 121797:121853 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-event-system-7
Diffstat (limited to 'indra/llui/llui.h')
| -rw-r--r-- | indra/llui/llui.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llui.h b/indra/llui/llui.h index ebcc7304b1..6d6ce7a97c 100644 --- a/indra/llui/llui.h +++ b/indra/llui/llui.h @@ -43,7 +43,7 @@ #include "llgl.h" // *TODO: break this dependency #include <stack> //#include "llimagegl.h" -#include <boost/signal.hpp> +#include <boost/signals2.hpp> // LLUIFactory #include "llsd.h" @@ -661,7 +661,7 @@ template <typename T> std::set<T*> LLInstanceTracker<T, T*>::sInstances; class LLCallbackRegistry { public: - typedef boost::signal<void()> callback_signal_t; + typedef boost::signals2::signal<void()> callback_signal_t; void registerCallback(const callback_signal_t::slot_type& slot) { |