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/llcharacter/llkeyframemotion.h | |
| 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/llcharacter/llkeyframemotion.h')
| -rw-r--r-- | indra/llcharacter/llkeyframemotion.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcharacter/llkeyframemotion.h b/indra/llcharacter/llkeyframemotion.h index edf2308050..d5b27c8102 100644 --- a/indra/llcharacter/llkeyframemotion.h +++ b/indra/llcharacter/llkeyframemotion.h @@ -420,7 +420,7 @@ public: ~JointMotionList(); U32 dumpDiagInfo(); JointMotion* getJointMotion(U32 index) const { llassert(index < mJointMotionArray.size()); return mJointMotionArray[index]; } - U32 getNumJointMotions() const { return mJointMotionArray.size(); } + U32 getNumJointMotions() const { return static_cast<U32>(mJointMotionArray.size()); } }; protected: |