diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-06-12 17:04:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-12 17:04:34 -0700 |
| commit | 100ebbab2437de7f5d124a0d7b8279a7a7b57656 (patch) | |
| tree | e8b4200dae16e89698c2f3eadae05634041681a1 /indra/llfilesystem/lllfsthread.cpp | |
| parent | f5e2708a0fc4e08d3d0a5dc393bbd4bac09e1c55 (diff) | |
| parent | ae74ca80692c8bcf157e903033fcfa1778706d64 (diff) | |
Merge pull request #1745 from secondlife/project/gltf_development
move project/gltf development to develop
Diffstat (limited to 'indra/llfilesystem/lllfsthread.cpp')
| -rw-r--r-- | indra/llfilesystem/lllfsthread.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llfilesystem/lllfsthread.cpp b/indra/llfilesystem/lllfsthread.cpp index 7d135b4472..6a882f64a8 100644 --- a/indra/llfilesystem/lllfsthread.cpp +++ b/indra/llfilesystem/lllfsthread.cpp @@ -45,7 +45,7 @@ void LLLFSThread::initClass(bool local_is_threaded) //static S32 LLLFSThread::updateClass(U32 ms_elapsed) { - return sLocal->update((F32)ms_elapsed); + return static_cast<S32>(sLocal->update((F32)ms_elapsed)); } //static |