diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-01-31 19:24:35 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-01-31 19:24:35 +0000 |
| commit | 29e8215faaf0ed949ffadd81eeb92b43d6af1f3f (patch) | |
| tree | b2b60084aaf2210772a885cc008a8db04151341d /indra | |
| parent | fc5f897a1d6b57b93a33e894675645b6216fadfe (diff) | |
| parent | 7469fdba800e9a5d282ddc16f034aca71a2e8764 (diff) | |
Merged in andreykproductengine/maint-eep (pull request #252)
SL-1531 Mac build fix
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llmultislider.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/llui/llmultislider.h b/indra/llui/llmultislider.h index b85eec1e61..20c3437ec4 100644 --- a/indra/llui/llmultislider.h +++ b/indra/llui/llmultislider.h @@ -92,8 +92,8 @@ public: void resetCurSlider(); void setCurSliderValue(F32 val, BOOL from_event = false) { setSliderValue(mCurSlider, val, from_event); } - /*virtual*/ void setValue(const LLSD& value); - /*virtual*/ LLSD getValue() const { return mValue; } + /*virtual*/ void setValue(const LLSD& value) override; + /*virtual*/ LLSD getValue() const override { return mValue; } boost::signals2::connection setMouseDownCallback( const commit_signal_t::slot_type& cb ); boost::signals2::connection setMouseUpCallback( const commit_signal_t::slot_type& cb ); @@ -104,14 +104,14 @@ public: bool addSlider(F32 val, const std::string& name); void deleteSlider(const std::string& name); void deleteCurSlider() { deleteSlider(mCurSlider); } - void clear(); + /*virtual*/ void clear() override; - /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask); - /*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask); - /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask); - /*virtual*/ BOOL handleKeyHere(KEY key, MASK mask); + /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask) override; + /*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask) override; + /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask) override; + /*virtual*/ BOOL handleKeyHere(KEY key, MASK mask) override; /*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask) override; - /*virtual*/ void draw(); + /*virtual*/ void draw() override; S32 getMaxNumSliders() { return mMaxNumSliders; } S32 getCurNumSliders() { return mValue.size(); } |