diff options
| author | James Cook <james@lindenlab.com> | 2009-11-24 08:47:13 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-24 08:47:13 -0800 |
| commit | f9081220accfe5c197f1c567af8806bde236f946 (patch) | |
| tree | e711a74a34aa309222d28f694f02345dde305c4d /indra/llui/llsliderctrl.h | |
| parent | 76be5ddc7022508e7d3fcb04165b4a6f64f1d58d (diff) | |
| parent | 0b3f6b3e9a1414c11ccf6011930c2eec6cf2fdd7 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
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: |