diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-03-29 05:45:49 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-03-29 05:45:49 +0800 |
| commit | b7f21024384416f2491ab980ea711fa5d24b7c91 (patch) | |
| tree | 3876b162434fb51efb7fe77e44b7795010a88535 | |
| parent | cf3c79d1d47fe33e3fe8700cb6ae93db0a24e97d (diff) | |
Some compilers may find it ambiguous as in anything newer than C++17,
it could be float, double or long double.
This lerp is meant to be the float one, as the 4th argument is, and
the 3rd argument is an F32.
| -rw-r--r-- | indra/newview/llpanelprimmediacontrols.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp index b8c12ce0b9..00d87fb026 100644 --- a/indra/newview/llpanelprimmediacontrols.cpp +++ b/indra/newview/llpanelprimmediacontrols.cpp @@ -777,7 +777,7 @@ void LLPanelPrimMediaControls::draw() else if(mFadeTimer.getStarted()) { F32 time = mFadeTimer.getElapsedTimeF32(); - alpha *= llmax(lerp(1.0, 0.0, time / mControlFadeTime), 0.0f); + alpha *= llmax(lerp(1.0f, 0.0f, time / mControlFadeTime), 0.0f); if(time >= mControlFadeTime) { |