diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-06-12 14:33:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-12 14:33:01 -0700 |
| commit | 071e464155a670a9a7e836ec52049fc80b507995 (patch) | |
| tree | e129794d3f4c29c92d6515cbdbe6898ee8aa558b /indra/newview/llviewertextureanim.cpp | |
| parent | f0de2ba6340e0d540aa70ac0086defde52cf60af (diff) | |
| parent | 8444cd9562a6a7b755fcb075864e205122354192 (diff) | |
Merge pull request #1723 from secondlife/brad/maint-a-merge-to-gltf-dev
maint a merge to gltf dev
Diffstat (limited to 'indra/newview/llviewertextureanim.cpp')
| -rw-r--r-- | indra/newview/llviewertextureanim.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewertextureanim.cpp b/indra/newview/llviewertextureanim.cpp index 9342eb2865..238e6830ea 100644 --- a/indra/newview/llviewertextureanim.cpp +++ b/indra/newview/llviewertextureanim.cpp @@ -43,13 +43,13 @@ LLViewerTextureAnim::LLViewerTextureAnim(LLVOVolume* vobj) : LLTextureAnim() mScaleS = mScaleT = 1; mRot = 0; - mInstanceIndex = sInstanceList.size(); + mInstanceIndex = static_cast<S32>(sInstanceList.size()); sInstanceList.push_back(this); } LLViewerTextureAnim::~LLViewerTextureAnim() { - S32 end_idx = sInstanceList.size()-1; + S32 end_idx = static_cast<S32>(sInstanceList.size()) - 1; if (end_idx != mInstanceIndex) { |