diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-03-26 10:53:53 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-03-26 10:53:53 -0400 |
| commit | 7a212eb7e5a44e4b1df96e1c48c2b5afb580c1a6 (patch) | |
| tree | 51135a256d52c71e0141690837a8552bc84a441d /indra/llui/llsliderctrl.h | |
| parent | 4d65987af842f59994b6c547a0598410d881179b (diff) | |
| parent | ab30a44d9de332466841bfb40aa494ff0db1089a (diff) | |
merge changes for tools update tip
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 |