diff options
| author | Richard Linden <none@none> | 2013-06-20 16:46:23 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-06-20 16:46:23 -0700 |
| commit | a2a6bf20d71f923e9a5e43f71213fffbfea5a2a6 (patch) | |
| tree | 7e2711d256f98872db24e1f9de4449d47e75ed88 /indra/llui/llbutton.cpp | |
| parent | 2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff) | |
| parent | e2e6963677657e4f5c417edc8d60e8b2a37ad204 (diff) | |
merge with release
Diffstat (limited to 'indra/llui/llbutton.cpp')
| -rwxr-xr-x | indra/llui/llbutton.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index a8149a9a1d..ce4d137478 100755 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -779,11 +779,11 @@ void LLButton::draw() { mCurGlowStrength = lerp(mCurGlowStrength, mFlashing ? (mFlashingTimer->isCurrentlyHighlighted() || !mFlashingTimer->isFlashingInProgress() || mNeedsHighlight? 1.0 : 0.0) : mHoverGlowStrength, - LLCriticalDamp::getInterpolant(0.05f)); + LLSmoothInterpolation::getInterpolant(0.05f)); } else { - mCurGlowStrength = lerp(mCurGlowStrength, 0.f, LLCriticalDamp::getInterpolant(0.05f)); + mCurGlowStrength = lerp(mCurGlowStrength, 0.f, LLSmoothInterpolation::getInterpolant(0.05f)); } // Draw button image, if available. |