summaryrefslogtreecommitdiff
path: root/indra/llui/llmultislider.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-10-14 14:13:30 -0400
committerOz Linden <oz@lindenlab.com>2010-10-14 14:13:30 -0400
commitac3f7c2b6b72aa955c0aa1337b8f25c6f097b429 (patch)
treed5954adeccf8ef19e66cdc8275521a5ea195e3cb /indra/llui/llmultislider.cpp
parent1bd19e8ffe99c4a2d0df8936bf01a63ebc05258f (diff)
parent7ea2a1f9cc998396f437ec2535ddb1d51cce46b1 (diff)
Automated merge with file:///Users/oz/Work/viewer-beta
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())