diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-19 09:59:03 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-19 09:59:03 -0400 |
| commit | 8b8fdd0bdd3a26fc889ebdfac73d7805fda7123b (patch) | |
| tree | dd1073ab359cfa71c23b22cf9e60ef16d9030998 /indra/llprimitive/llmodel.h | |
| parent | a6a0d5dda70de972ca1e386534284e2e93f29903 (diff) | |
| parent | 3ce04f335e640ef9a00b00aae94ef2de841a1f7b (diff) | |
merge
Diffstat (limited to 'indra/llprimitive/llmodel.h')
| -rw-r--r-- | indra/llprimitive/llmodel.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h index cd9f76fcb7..3f58eba07d 100644 --- a/indra/llprimitive/llmodel.h +++ b/indra/llprimitive/llmodel.h @@ -137,12 +137,13 @@ 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, LLSD& mdl, - BOOL nowrite = FALSE); + BOOL nowrite = FALSE, BOOL as_slm = FALSE); static LLModel* loadModelFromDomMesh(domMesh* mesh); static std::string getElementLabel(daeElement* element); @@ -171,6 +172,11 @@ public: void optimizeVolumeFaces(); void offsetMesh( const LLVector3& pivotPoint ); void getNormalizedScaleTranslation(LLVector3& scale_out, LLVector3& translation_out); + + //reorder face list based on mMaterialList in this and reference so + //order matches that of reference (material ordering touchup) + void matchMaterialOrder(LLModel* reference); + std::vector<std::string> mMaterialList; //data used for skin weights |