diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-11-30 12:19:38 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-30 12:19:38 -0600 |
| commit | a09b083b1b18d293d97dd84dd4849924b2766a4f (patch) | |
| tree | 6f0cbfd33d0cf125432ad0b8b93a2b052143ee14 /indra/llprimitive | |
| parent | 68875523e09f9fe06fc4b3cd5225995bb13966c3 (diff) | |
| parent | 88aefc95eace0bb8ea21cb44514d41d98bdf74cc (diff) | |
Merge branch 'DRTVWR-596' into davep/SL-20611
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/lldaeloader.cpp | 3 | ||||
| -rw-r--r-- | indra/llprimitive/llmodel.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp index 46e1cb4922..2e4b013b77 100644 --- a/indra/llprimitive/lldaeloader.cpp +++ b/indra/llprimitive/lldaeloader.cpp @@ -2584,7 +2584,8 @@ bool LLDAELoader::loadModelsFromDomMesh(domMesh* mesh, std::vector<LLModel*>& mo next->mLabel = model_name + (char)((int)'a' + next->mSubmodelID) + lod_suffix[mLod]; next->getVolumeFaces() = remainder; next->mNormalizedScale = ret->mNormalizedScale; - + next->mNormalizedTranslation = ret->mNormalizedTranslation; + if ( ret->mMaterialList.size() > LL_SCULPT_MESH_MAX_FACES) { next->mMaterialList.assign(ret->mMaterialList.begin() + LL_SCULPT_MESH_MAX_FACES, ret->mMaterialList.end()); diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index ee493968de..99a5697a84 100644 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -52,7 +52,8 @@ const int MODEL_NAMES_LENGTH = sizeof(model_names) / sizeof(std::string); LLModel::LLModel(LLVolumeParams& params, F32 detail) : LLVolume(params, detail), - mNormalizedScale(1,1,1), + mNormalizedScale(1,1,1), + mNormalizedTranslation(0, 0, 0), mPelvisOffset( 0.0f ), mStatus(NO_ERRORS), mSubmodelID(0) |