diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-06-28 11:02:11 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-06-28 11:02:11 -0400 |
| commit | 726851b039b0b0e7d623970f32b6b28616a07dc8 (patch) | |
| tree | 01dd9d23638486031dcc49d201c35d8338091794 /indra/llcharacter/llbvhloader.cpp | |
| parent | e9d2f57866e7e4dcb46b21bef525eb9955691578 (diff) | |
| parent | 6f8b812ecd73bf25d44445e1b791f9e1b01f429f (diff) | |
DRTVWR-582: Merge branch DRTVWR-582-maint-U into contribute-frozen
to resolve conflicts in installer_template.nsi
Diffstat (limited to 'indra/llcharacter/llbvhloader.cpp')
| -rw-r--r-- | indra/llcharacter/llbvhloader.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llcharacter/llbvhloader.cpp b/indra/llcharacter/llbvhloader.cpp index 117d408b21..5b1b28bf4f 100644 --- a/indra/llcharacter/llbvhloader.cpp +++ b/indra/llcharacter/llbvhloader.cpp @@ -1352,7 +1352,6 @@ BOOL LLBVHLoader::serialize(LLDataPacker& dp) dp.packS32(joint->mNumRotKeys, "num_rot_keys"); LLQuaternion::Order order = bvhStringToOrder( joint->mOrder ); - S32 outcount = 0; S32 frame = 0; for (Key& key : joint->mKeys) { @@ -1418,7 +1417,6 @@ BOOL LLBVHLoader::serialize(LLDataPacker& dp) dp.packU16(x, "rot_angle_x"); dp.packU16(y, "rot_angle_y"); dp.packU16(z, "rot_angle_z"); - outcount++; frame++; } |