diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-28 22:53:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-28 22:53:24 +0200 |
| commit | 9c0a6d1b0e5e9d6da6a63ff367f40ab08c064bbe (patch) | |
| tree | 70ee7701d7a24a0759915f8050786ed43a8a2a7a /indra/newview/llpanelprimmediacontrols.cpp | |
| parent | 0ef7a9b39cf72da1211039ab22bdf8f9f6a2c984 (diff) | |
| parent | b2f1e8899b32f681e13705d684db9a93d18450ae (diff) | |
Merge pull request #2966 from secondlife/marchcat/c-develop
develop → Maint C sync
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) { |