diff options
| author | Rider Linden <none@none> | 2015-04-03 14:50:53 -0700 |
|---|---|---|
| committer | Rider Linden <none@none> | 2015-04-03 14:50:53 -0700 |
| commit | 0962dd23bdca11cae7d4cabda338814de5f756c8 (patch) | |
| tree | 36b1fd594774d42fc69c2bbfdcef5977725413c5 /indra/llui/llsliderctrl.h | |
| parent | a25f4b49676e5a371d185bfb222e47893dd78b75 (diff) | |
| parent | 2de894bdc785c8d68dc4197b68aa9305450999f7 (diff) | |
Merge
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 |