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/llxml | |
| 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/llxml')
| -rw-r--r-- | indra/llxml/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | indra/llxml/llcontrol.h | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/indra/llxml/CMakeLists.txt b/indra/llxml/CMakeLists.txt index dc7787beea..c5fb44e721 100644 --- a/indra/llxml/CMakeLists.txt +++ b/indra/llxml/CMakeLists.txt @@ -39,6 +39,5 @@ add_library (llxml ${llxml_SOURCE_FILES}) # Sort by high-level to low-level target_link_libraries( llxml llmath - ${BOOST_SIGNALS_LIBRARY} ${EXPAT_LIBRARIES} ) diff --git a/indra/llxml/llcontrol.h b/indra/llxml/llcontrol.h index ba0a1c7cbf..a39a56aacd 100644 --- a/indra/llxml/llcontrol.h +++ b/indra/llxml/llcontrol.h @@ -53,7 +53,7 @@ #endif #include <boost/bind.hpp> -#include <boost/signal.hpp> +#include <boost/signals2.hpp> #if LL_WINDOWS # if (_MSC_VER >= 1300 && _MSC_VER < 1400) @@ -89,7 +89,7 @@ typedef enum e_control_type class LLControlVariable : public LLRefCount { friend class LLControlGroup; - typedef boost::signal<void(const LLSD&)> signal_t; + typedef boost::signals2::signal<void(const LLSD&)> signal_t; private: std::string mName; |