diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-09-26 13:48:58 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-09-26 13:48:58 -0400 |
| commit | 8a6da4d6210192ada4a26ddd397c00d78b08dfcc (patch) | |
| tree | b54e474b526128540c824610c43a1a6e6e206c10 /indra/newview | |
| parent | 452e07489b95e8ba60bf585878f9c0ed8e13b5e3 (diff) | |
Rename our lerp() to flerp(); call where MSVC balks at std::lerp().
Now the lerp() in global namespace is std::lerp(), but it remains true that
for some calls to std::lerp(), MSVC issues fatal argument conversion warnings.
In those places, call flerp() (our historic lerp()) instead.
Diffstat (limited to 'indra/newview')
| -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..1a092234fb 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(flerp(1.0, 0.0, time / mControlFadeTime), 0.0f); if(time >= mControlFadeTime) { |