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/llmultisliderctrl.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/llmultisliderctrl.h')
| -rw-r--r-- | indra/llui/llmultisliderctrl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llmultisliderctrl.h b/indra/llui/llmultisliderctrl.h index 85ba77b7df..4855ed4926 100644 --- a/indra/llui/llmultisliderctrl.h +++ b/indra/llui/llmultisliderctrl.h @@ -115,8 +115,8 @@ public: void setLabelColor(const LLColor4& c) { mTextEnabledColor = c; } void setDisabledLabelColor(const LLColor4& c) { mTextDisabledColor = c; } - boost::signals::connection setSliderMouseDownCallback( const commit_signal_t::slot_type& cb ); - boost::signals::connection setSliderMouseUpCallback( const commit_signal_t::slot_type& cb ); + boost::signals2::connection setSliderMouseDownCallback( const commit_signal_t::slot_type& cb ); + boost::signals2::connection setSliderMouseUpCallback( const commit_signal_t::slot_type& cb ); virtual void onTabInto(); |