diff options
author | angela <angela@lindenlab.com> | 2009-11-24 11:55:12 +0800 |
---|---|---|
committer | angela <angela@lindenlab.com> | 2009-11-24 11:55:12 +0800 |
commit | f27aff450fd394dc53c7160d58df40037d57c774 (patch) | |
tree | 3893fd9aed15b0a3c186d565bc0afb7bdc8247a3 /indra/llui/llsliderctrl.cpp | |
parent | 65fd784f136d4fc2183b97b6c15bd0c338bdb833 (diff) | |
parent | cfccf4d5145274f7bfe1c88b7e51c000461226e8 (diff) |
Automated merge with ssh://angela@hg.lindenlab.com/james/gooey
Diffstat (limited to 'indra/llui/llsliderctrl.cpp')
-rw-r--r-- | indra/llui/llsliderctrl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llsliderctrl.cpp b/indra/llui/llsliderctrl.cpp index a4f89ae1d3..01c274bb4e 100644 --- a/indra/llui/llsliderctrl.cpp +++ b/indra/llui/llsliderctrl.cpp @@ -122,7 +122,8 @@ LLSliderCtrl::LLSliderCtrl(const LLSliderCtrl::Params& p) slider_p.min_value.setIfNotProvided(p.min_value); slider_p.max_value.setIfNotProvided(p.max_value); slider_p.increment.setIfNotProvided(p.increment); - + slider_p.orientation.setIfNotProvided(p.orientation); + slider_p.commit_callback.function(&LLSliderCtrl::onSliderCommit); slider_p.control_name(p.control_name); slider_p.mouse_down_callback( p.mouse_down_callback ); |