Merge remote-tracking branch 'secondlife/release/2024.08-DeltaFPS' into 2024.08-DeltaFPS

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/newview/llagentpilot.cpp b/indra/newview/llagentpilot.cpp
index 40f1679663..0b5198bbd3 100644
--- a/indra/newview/llagentpilot.cpp
+++ b/indra/newview/llagentpilot.cpp
@@ -145,7 +145,7 @@ void LLAgentPilot::loadXML(const std::string& filename)
         Action action;
         action.mTime = record["time"].asReal();
         action.mType = (EActionType)record["type"].asInteger();
-        action.mCameraView = record["camera_view"].asReal();
+        action.mCameraView = (F32)record["camera_view"].asReal();
         action.mTarget = ll_vector3d_from_sd(record["target"]);
         action.mCameraOrigin = ll_vector3_from_sd(record["camera_origin"]);
         action.mCameraXAxis = ll_vector3_from_sd(record["camera_xaxis"]);
@@ -297,8 +297,8 @@ void LLAgentPilot::moveCamera()
         S32 start_index = llmax(mCurrentAction-1,0);
         S32 end_index = mCurrentAction;
         F32 t = 0.0;
-        F32 timedelta = mActions[end_index].mTime - mActions[start_index].mTime;
-        F32 tickelapsed = mTimer.getElapsedTimeF32()-mActions[start_index].mTime;
+        F32 timedelta = (F32)(mActions[end_index].mTime - mActions[start_index].mTime);
+        F32 tickelapsed = mTimer.getElapsedTimeF32()-(F32)mActions[start_index].mTime;
         if (timedelta > 0.0)
         {
             t = tickelapsed/timedelta;