summaryrefslogtreecommitdiff
path: root/indra/llui/llmultislider.cpp
diff options
context:
space:
mode:
authorsimon@lindenlab.com <simon@lindenlab.com>2011-07-07 17:46:18 -0700
committersimon@lindenlab.com <simon@lindenlab.com>2011-07-07 17:46:18 -0700
commit1cf5ce3a436297e0ac2293eacae7428f231fe1ec (patch)
tree4a074ab4bebd09ff53df696954f0f091cd48327c /indra/llui/llmultislider.cpp
parentf5bd2109c27b098dd73a9578f1f032b6ff9e4c2d (diff)
parent66dcc72870b19c6ada65a643ca33c779c9c9989b (diff)
Merge latest from viewer trunk
Diffstat (limited to 'indra/llui/llmultislider.cpp')
-rw-r--r--indra/llui/llmultislider.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llmultislider.cpp b/indra/llui/llmultislider.cpp
index f744e9db41..9052bc7d1d 100644
--- a/indra/llui/llmultislider.cpp
+++ b/indra/llui/llmultislider.cpp
@@ -511,7 +511,7 @@ void LLMultiSlider::draw()
mIt->second.mTop + extra_triangle_height,
mIt->second.mLeft + mIt->second.getWidth() / 2,
mIt->second.mBottom - extra_triangle_height,
- mTriangleColor.get(), TRUE);
+ mTriangleColor.get() % opacity, TRUE);
}
}
else if (!thumb_imagep)