diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-03-29 05:50:44 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-03-29 05:50:44 +0800 |
| commit | 7bb1791be2a2f41a381736e3f2ca2a5ccde37063 (patch) | |
| tree | 69dc6f1edb2d37aec937c9fcb354f0bafcef26ed /indra/newview/llpanelprimmediacontrols.cpp | |
| parent | 834b75506e78a42fcef8e4586cef9b957a1fecba (diff) | |
| parent | b7f21024384416f2491ab980ea711fa5d24b7c91 (diff) | |
Merge branch 'main' into 2025.03
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 b00b9d1ad1..7b562337a3 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) { |