diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-03-24 19:52:46 +0200 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-03-24 19:52:46 +0200 |
| commit | bd3ee81e8d7f739b0ff733f19e3922ce03433be4 (patch) | |
| tree | 3ece7ba3dc95d12a9b3db72264cba2378f9febdb /indra/llui/llsliderctrl.h | |
| parent | 18bacca5ca066c6fb1b38a82e322b624923b7340 (diff) | |
| parent | c489f1f8647a77c8c7d5fb5b721433dd72cb49c8 (diff) | |
Merge with viewer-release and become 3.7.27
Diffstat (limited to 'indra/llui/llsliderctrl.h')
| -rwxr-xr-x | indra/llui/llsliderctrl.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llui/llsliderctrl.h b/indra/llui/llsliderctrl.h index 5153e33f49..67cca9ef04 100755 --- a/indra/llui/llsliderctrl.h +++ b/indra/llui/llsliderctrl.h @@ -81,7 +81,7 @@ protected: LLSliderCtrl(const Params&); friend class LLUICtrlFactory; public: - virtual ~LLSliderCtrl() {} // Children all cleaned up by default view destructor. + virtual ~LLSliderCtrl(); /*virtual*/ F32 getValueF32() const { return mSlider->getValueF32(); } void setValue(F32 v, BOOL from_event = FALSE); @@ -112,6 +112,7 @@ public: boost::signals2::connection setSliderMouseDownCallback( const commit_signal_t::slot_type& cb ); boost::signals2::connection setSliderMouseUpCallback( const commit_signal_t::slot_type& cb ); + boost::signals2::connection setSliderEditorCommitCallback( const commit_signal_t::slot_type& cb ); /*virtual*/ void onTabInto(); @@ -150,6 +151,8 @@ private: LLUIColor mTextEnabledColor; LLUIColor mTextDisabledColor; + + commit_signal_t* mEditorCommitSignal; }; #endif // LL_LLSLIDERCTRL_H |