diff options
| author | Anchor <none@none> | 2018-11-28 15:16:01 -0800 |
|---|---|---|
| committer | Anchor <none@none> | 2018-11-28 15:16:01 -0800 |
| commit | 014480a79b765587881d0c0f707a7ee191f5fe2e (patch) | |
| tree | 4d759c7b996065cccb9171a51a1a3f05d04b6e31 /indra/llprimitive/llmodel.h | |
| parent | 076719013ec2dab7bf8fd1f4d1f953ab73d594e9 (diff) | |
| parent | 8558ce5c600b810356010ba3cd6d534ef22f4081 (diff) | |
Merge
Diffstat (limited to 'indra/llprimitive/llmodel.h')
| -rw-r--r-- | indra/llprimitive/llmodel.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h index 097558ef67..cf3288489a 100644 --- a/indra/llprimitive/llmodel.h +++ b/indra/llprimitive/llmodel.h @@ -38,7 +38,6 @@ class domMesh; #define MAX_MODEL_FACES 8 - class LLMeshSkinInfo { public: @@ -57,6 +56,7 @@ public: float mPelvisOffset; bool mLockScaleIfJointPosition; bool mInvalidJointsScrubbed; + bool mJointNumsInitialized; }; class LLModel : public LLVolume @@ -158,9 +158,6 @@ public: EModelStatus getStatus() const {return mStatus;} static std::string getStatusString(U32 status) ; - void appendFaces(LLModel* model, LLMatrix4& transform, LLMatrix4& normal_transform); - void appendFace(const LLVolumeFace& src_face, std::string src_material, LLMatrix4& mat, LLMatrix4& norm_mat); - void setNumVolumeFaces(S32 count); void setVolumeFaceData( S32 f, |