From b7f21024384416f2491ab980ea711fa5d24b7c91 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Sat, 29 Mar 2025 05:45:49 +0800 Subject: Explicit float remaining arguments for lerp 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. --- indra/newview/llpanelprimmediacontrols.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') 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) { -- cgit v1.2.3