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/llmenugl.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/llmenugl.h')
| -rw-r--r-- | indra/llui/llmenugl.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h index 3cb76efce0..ffaecc2c15 100644 --- a/indra/llui/llmenugl.h +++ b/indra/llui/llmenugl.h @@ -285,12 +285,12 @@ public: //virtual void draw(); - boost::signals::connection setClickCallback( const commit_signal_t::slot_type& cb ) + boost::signals2::connection setClickCallback( const commit_signal_t::slot_type& cb ) { return setCommitCallback(cb); } - boost::signals::connection setEnableCallback( const enable_signal_t::slot_type& cb ) + boost::signals2::connection setEnableCallback( const enable_signal_t::slot_type& cb ) { return mEnableSignal.connect(cb); } @@ -335,7 +335,7 @@ public: // called to rebuild the draw label virtual void buildDrawLabel( void ); - boost::signals::connection setCheckCallback( const enable_signal_t::slot_type& cb ) + boost::signals2::connection setCheckCallback( const enable_signal_t::slot_type& cb ) { return mCheckSignal.connect(cb); } @@ -823,7 +823,7 @@ private: // *TODO: Eliminate // For backwards compatability only; generally just use boost::bind -class view_listener_t : public boost::signals::trackable +class view_listener_t : public boost::signals2::trackable { public: virtual bool handleEvent(const LLSD& userdata) = 0; |