diff options
| author | Callum Prentice <callum@lindenlab.com> | 2025-10-20 10:25:50 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2025-10-20 10:25:50 -0700 |
| commit | c64c16a59ae2220b29ba0ed1f3f22da07e694612 (patch) | |
| tree | 715e1ce1c6049469cffc27bcb0c8b636433539e5 /indra/llprimitive/llmodel.cpp | |
| parent | 53d83104522fc683126ba764b3e2101dc7442547 (diff) | |
| parent | 03690724188cb3fef1c2efed0f5626c93096ec2d (diff) | |
Merge branch 'develop' of https://github.com/secondlife/viewer into callum/voice-moderation-2
Diffstat (limited to 'indra/llprimitive/llmodel.cpp')
| -rw-r--r-- | indra/llprimitive/llmodel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index 00ef79ce7f..8055bffd32 100644 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -1296,10 +1296,10 @@ LLModel::weight_list& LLModel::getJointInfluences(const LLVector3& pos) } void LLModel::setConvexHullDecomposition( - const LLModel::convex_hull_decomposition& decomp) + const LLModel::convex_hull_decomposition& decomp, const std::vector<LLModel::PhysicsMesh>& decomp_mesh) { mPhysics.mHull = decomp; - mPhysics.mMesh.clear(); + mPhysics.mMesh = decomp_mesh; updateHullCenters(); } |