summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-10-21 12:29:33 -0700
committerRichard Linden <none@none>2013-10-21 12:29:33 -0700
commit04397a095acd6ceeb280b3fc82cf122fd6ccf43a (patch)
tree3c536c65921408db82745e3c252bec5b009be2da /indra/llui
parentfcf5602ba82015cc4ab40734b97a7b8c9085d2d6 (diff)
more buildfix
Diffstat (limited to 'indra/llui')
-rwxr-xr-xindra/llui/llbutton.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index 2c6aab9fff..f51dfe4707 100755
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -778,7 +778,7 @@ void LLButton::draw()
if (use_glow_effect)
{
mCurGlowStrength = lerp(mCurGlowStrength,
- mFlashing ? (mFlashingTimer->isCurrentlyHighlighted() || !mFlashingTimer->isFlashingInProgress() || mNeedsHighlight? 1.0 : 0.0) : mHoverGlowStrength,
+ mFlashing ? (mFlashingTimer->isCurrentlyHighlighted() || !mFlashingTimer->isFlashingInProgress() || mNeedsHighlight? 1.f : 0.f) : mHoverGlowStrength,
LLSmoothInterpolation::getInterpolant(0.05f));
}
else