diff options
author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-26 09:31:55 +0200 |
---|---|---|
committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-26 09:31:55 +0200 |
commit | 4c81e7a85c3fe69f16ac3996df732627dda8533a (patch) | |
tree | 25af0dff630ae8d5cbf5e572c8286122ebaf79a7 /indra/llui/llsliderctrl.h | |
parent | 1533f3d2a6fcbfd1550b3840c2d2327283f131c0 (diff) | |
parent | b19b63ad8cba7b1c3e44c4084313103765af1917 (diff) |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/llsliderctrl.h')
-rw-r--r-- | indra/llui/llsliderctrl.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llsliderctrl.h b/indra/llui/llsliderctrl.h index 4a1574d502..c425849782 100644 --- a/indra/llui/llsliderctrl.h +++ b/indra/llui/llsliderctrl.h @@ -46,6 +46,7 @@ class LLSliderCtrl : public LLF32UICtrl public: struct Params : public LLInitParam::Block<Params, LLF32UICtrl::Params> { + Optional<std::string> orientation; Optional<S32> label_width; Optional<S32> text_width; Optional<bool> show_text; @@ -78,7 +79,8 @@ public: value_text("value_text"), slider_label("slider_label"), mouse_down_callback("mouse_down_callback"), - mouse_up_callback("mouse_up_callback") + mouse_up_callback("mouse_up_callback"), + orientation("orientation", std::string ("horizontal")) {} }; protected: |