summaryrefslogtreecommitdiff
path: root/indra/llui/llmultislider.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-10-04 11:21:18 -0400
committerLoren Shih <seraph@lindenlab.com>2010-10-04 11:21:18 -0400
commitd65e512fa3a0e7bc7f1c269d2c8d2e1c38c4e970 (patch)
tree324168722ec39359f4753aa4acf6ca65c8b72ab3 /indra/llui/llmultislider.cpp
parentd3e71fdc2c35ab75ebdac573698bbb86bbd0d98f (diff)
parentd3a9d6a6cef6630995c652b4cc04c8807dbe6d4e (diff)
Automated merge up from viewer-development
Diffstat (limited to 'indra/llui/llmultislider.cpp')
-rw-r--r--indra/llui/llmultislider.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llmultislider.cpp b/indra/llui/llmultislider.cpp
index 1f6fa12969..d4e6091ee0 100644
--- a/indra/llui/llmultislider.cpp
+++ b/indra/llui/llmultislider.cpp
@@ -101,8 +101,8 @@ LLMultiSlider::LLMultiSlider(const LLMultiSlider::Params& p)
setMouseUpCallback(initCommitCallback(p.mouse_up_callback));
}
- for (LLInitParam::ParamIterator<SliderParams>::const_iterator it = p.sliders().begin();
- it != p.sliders().end();
+ for (LLInitParam::ParamIterator<SliderParams>::const_iterator it = p.sliders.begin();
+ it != p.sliders.end();
++it)
{
if (it->name.isProvided())