diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-07-06 19:27:43 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-07-06 19:27:43 -0500 |
| commit | 9b253ccf68718dea51dc94416b3ece28b42fc32a (patch) | |
| tree | 74639cf7e73c17d28222a95e4d44728eaa78ee0d /indra/llprimitive | |
| parent | 71eb68a85d5a5157622ae8f42bac1c21f00d54cd (diff) | |
SH-1972 Fix for slm messing up physics shape on second upload.
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/llmodel.cpp | 7 | ||||
| -rw-r--r-- | indra/llprimitive/llmodel.h | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index 34b81c9672..d3f42c63d5 100644 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -1347,7 +1347,8 @@ LLSD LLModel::writeModel( const LLModel::Decomposition& decomp, BOOL upload_skin, BOOL upload_joints, - BOOL nowrite) + BOOL nowrite, + BOOL as_slm) { LLSD mdl; @@ -1371,8 +1372,8 @@ LLSD LLModel::writeModel( !decomp.mHull.empty()) { mdl["physics_convex"] = decomp.asLLSD(); - if (!decomp.mHull.empty()) - { //convex decomposition exists, physics mesh will not be used + if (!decomp.mHull.empty() && !as_slm) + { //convex decomposition exists, physics mesh will not be used (unless this is an slm file) model[LLModel::LOD_PHYSICS] = NULL; } } diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h index cd9f76fcb7..1ece877f0f 100644 --- a/indra/llprimitive/llmodel.h +++ b/indra/llprimitive/llmodel.h @@ -137,7 +137,8 @@ public: const LLModel::Decomposition& decomp, BOOL upload_skin, BOOL upload_joints, - BOOL nowrite = FALSE); + BOOL nowrite = FALSE, + BOOL as_slm = FALSE); static LLSD writeModelToStream( std::ostream& ostr, |