diff options
| author | nat-goodspeed <nat@lindenlab.com> | 2024-10-24 12:21:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-24 12:21:13 -0400 |
| commit | b611324db58def7d65f4bfc721e7dc1c378b7fa3 (patch) | |
| tree | 22074ffb1c262b9ffbb458a2836405e5c086ce7d /indra/newview/llpanelprimmediacontrols.cpp | |
| parent | 299c37adaec5cf33981cbbaa3c25c68152b14725 (diff) | |
| parent | 168a5f36b92f5cbc3d83248fb5ffbb47a3b7e223 (diff) | |
Merge pull request #2585 from secondlife/marchcat/xcode-16
Xcode16 build fix
Diffstat (limited to 'indra/newview/llpanelprimmediacontrols.cpp')
| -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 1af585708e..955b5e7730 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) { |