summaryrefslogtreecommitdiff
path: root/indra/newview/llhudeffectblob.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2011-03-15 12:02:58 -0700
committerLeyla Farazha <leyla@lindenlab.com>2011-03-15 12:02:58 -0700
commit3f64343b0b078e481c1c852ccd7201be6826a110 (patch)
tree8e82154ded91c169702e374d2e293712542805fd /indra/newview/llhudeffectblob.cpp
parentfa277a3b4a5d5dc5af6eb53ecd005e4789534758 (diff)
parent2c22863888eefbfb0f4245011be989d155583db7 (diff)
Merge
Diffstat (limited to 'indra/newview/llhudeffectblob.cpp')
-rw-r--r--indra/newview/llhudeffectblob.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llhudeffectblob.cpp b/indra/newview/llhudeffectblob.cpp
index f976a320ee..26e8251899 100644
--- a/indra/newview/llhudeffectblob.cpp
+++ b/indra/newview/llhudeffectblob.cpp
@@ -61,7 +61,7 @@ void LLHUDEffectBlob::render()
gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
LLColor4U color = mColor;
- color.mV[VALPHA] = clamp_rescale(time, 0.f, mDuration, 255.f, 0.f);
+ color.mV[VALPHA] = (U8)clamp_rescale(time, 0.f, mDuration, 255.f, 0.f);
glColor4ubv(color.mV);
glPushMatrix();