diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-10-24 14:44:48 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-10-24 14:44:48 -0400 |
| commit | 6daa52b3b93328506e34d6595a01d30c334897bc (patch) | |
| tree | bdbe951d06f95a1a7752d5c23950eda7bb36a9e7 /indra/newview/llpanelprimmediacontrols.cpp | |
| parent | 850bdf4ce335049a75e1c4f6400b627bf328a264 (diff) | |
| parent | b611324db58def7d65f4bfc721e7dc1c378b7fa3 (diff) | |
Merge branch 'develop' into maxim/viewer_2245
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) { |