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/llui/llui.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/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 18aa1aa143..71396e10d9 100644 --- a/indra/llui/llui.h +++ b/indra/llui/llui.h @@ -45,7 +45,7 @@ #include "lluiimage.h" // *TODO: break this dependency, need to add #include "lluiimage.h" to all widgets that hold an Optional<LLUIImage*> in their paramblocks #include "llinitparam.h" #include "llregistry.h" -#include <boost/signal.hpp> +#include <boost/signals2.hpp> #include "lllazyvalue.h" // LLUIFactory @@ -576,7 +576,7 @@ public: 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) { |