summaryrefslogtreecommitdiff
path: root/indra/llui/llmultislider.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-07-21 15:02:03 -0400
committerOz Linden <oz@lindenlab.com>2011-07-21 15:02:03 -0400
commitc118ec209907618c77613990fe2359d4f92802e6 (patch)
treeb2fa95d1fa1563cdee89d2bf035b680c64918c0f /indra/llui/llmultislider.cpp
parent54bb91fd03d0c2f2600993274c59ae89324eeb03 (diff)
parent67e365ba57bb7024a64bc0663782cd7f06b4a5cc (diff)
merge up changes for 2.8.0 release
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)