diff options
| author | Eric Tulla <tulla@lindenlab.com> | 2009-03-05 00:29:27 +0000 |
|---|---|---|
| committer | Eric Tulla <tulla@lindenlab.com> | 2009-03-05 00:29:27 +0000 |
| commit | 6db6d81b0a90fe7b48a3ccf64ba768e5772397c8 (patch) | |
| tree | c3b9f11fbbfa29cd23b7de22543fd80285ad810d /indra/newview/llviewerjoint.h | |
| parent | c0af95e18c57a7e0578df780697042f8a6221431 (diff) | |
Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272).
No conflicts in the merge.
Result of:
svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 .
Diffstat (limited to 'indra/newview/llviewerjoint.h')
| -rw-r--r-- | indra/newview/llviewerjoint.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llviewerjoint.h b/indra/newview/llviewerjoint.h index 0430a91833..a07902e582 100644 --- a/indra/newview/llviewerjoint.h +++ b/indra/newview/llviewerjoint.h @@ -40,6 +40,7 @@ #include "llapr.h" class LLFace; +class LLViewerJointMesh; //----------------------------------------------------------------------------- // class LLViewerJoint @@ -133,8 +134,13 @@ public: void setVisible( BOOL visible, BOOL recursive ); + // Takes meshes in mMeshParts and sets each one as a child joint + void setMeshesToChildren(); + public: static BOOL sDisableLOD; + std::vector<LLViewerJointMesh*> mMeshParts; + void setMeshID( S32 id ) {mMeshID = id;} protected: BOOL mValid; @@ -142,6 +148,7 @@ protected: F32 mMinPixelArea; PickName mPickName; BOOL mVisible; + S32 mMeshID; }; class LLViewerJointCollisionVolume : public LLViewerJoint |