diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-12-04 13:11:22 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-12-04 13:11:22 +0800 |
| commit | d9d932f6375df28dbc59088fc09cd986043651d0 (patch) | |
| tree | 0dae07bf66d2e8b3ad25a1a9ec994b303a5f01f8 /indra/llprimitive/llmodel.cpp | |
| parent | dcc927e1d29b2b927ae27f8f50a1dcadb4488c80 (diff) | |
| parent | 780b5c3bd9a2a97790efc1169817f1fc574f3387 (diff) | |
Merge branch '2025.08'
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 98faa88968..db752411fc 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(); } |