diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-04-26 19:40:09 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-04-26 19:40:09 +0300 |
commit | 231dea378babc0ee9806f0fcd68283e79f81d2eb (patch) | |
tree | d4e42cf3ea6c212ffb1e2958f6cb6568ac5bdd0a /indra/llui/llsliderctrl.h | |
parent | e77134ea898cd19fdba716e46324b2945ef6826f (diff) | |
parent | d7f1c88c35849e56f5b352f13c16a08467d1533b (diff) |
Merge branch 'master' into DRTVWR-486
Diffstat (limited to 'indra/llui/llsliderctrl.h')
-rw-r--r-- | indra/llui/llsliderctrl.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/llsliderctrl.h b/indra/llui/llsliderctrl.h index 2bb8668b90..541c167717 100644 --- a/indra/llui/llsliderctrl.h +++ b/indra/llui/llsliderctrl.h @@ -125,6 +125,9 @@ public: mSlider->setControlName(control_name, context); } + /*virtual*/ void setRect(const LLRect& rect); + /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); + static void onSliderCommit(LLUICtrl* caller, const LLSD& userdata); static void onEditorCommit(LLUICtrl* ctrl, const LLSD& userdata); @@ -146,6 +149,7 @@ protected: } private: void updateText(); + void updateSliderRect(); void reportInvalidData(); const LLFontGL* mFont; |