diff options
| author | Ansariel <ansariel.hiller@phoenixviewer.com> | 2024-02-19 15:01:44 +0100 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-02-19 18:06:08 +0200 |
| commit | 321f283032688f0feddc696654e86f62af07121a (patch) | |
| tree | d0e75b664fa7756d70ddaa5e9796c1ee38a9d8e8 /indra/llcharacter | |
| parent | c2e00c0403b95ef10264807bdbfc3b1e4fdf0921 (diff) | |
Replace remaining BOOL with bool llinventory and llmessage
Diffstat (limited to 'indra/llcharacter')
| -rw-r--r-- | indra/llcharacter/llkeyframemotion.cpp | 4 | ||||
| -rw-r--r-- | indra/llcharacter/llkeyframemotion.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp index ba6cc025be..fa87ad8c29 100644 --- a/indra/llcharacter/llkeyframemotion.cpp +++ b/indra/llcharacter/llkeyframemotion.cpp @@ -1339,12 +1339,14 @@ bool LLKeyframeMotion::deserialize(LLDataPacker& dp, const LLUUID& asset_id, boo return false; } - if (!dp.unpackS32(joint_motion_list->mLoop, "loop")) + S32 loop{ 0 }; + if (!dp.unpackS32(loop, "loop")) { LL_WARNS() << "can't read loop" << " for animation " << asset_id << LL_ENDL; return false; } + joint_motion_list->mLoop = static_cast<bool>(loop); //SL-17206 hack to alter Female_land loop setting, while current behavior won't be changed serverside LLUUID const female_land_anim("ca1baf4d-0a18-5a1f-0330-e4bd1e71f09e"); diff --git a/indra/llcharacter/llkeyframemotion.h b/indra/llcharacter/llkeyframemotion.h index 56c4364fd8..4acebeba27 100644 --- a/indra/llcharacter/llkeyframemotion.h +++ b/indra/llcharacter/llkeyframemotion.h @@ -398,7 +398,7 @@ public: public: std::vector<JointMotion*> mJointMotionArray; F32 mDuration; - BOOL mLoop; + bool mLoop; F32 mLoopInPoint; F32 mLoopOutPoint; F32 mEaseInDuration; |