diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-11-20 17:03:55 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-11-20 17:03:55 -0600 |
| commit | 5d34ac552f3939626840b703b2da380663f25f49 (patch) | |
| tree | ddeacd3365fed0ad193c053d39ebeb39451cc74a /indra/newview/llpolymesh.h | |
| parent | a830812172d7eb163c06ead3155dc4b43ded4346 (diff) | |
| parent | 8db983fb8095f25873b8317fd1f4764abce4a31b (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llpolymesh.h')
| -rw-r--r-- | indra/newview/llpolymesh.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llpolymesh.h b/indra/newview/llpolymesh.h index 850171d169..28da230541 100644 --- a/indra/newview/llpolymesh.h +++ b/indra/newview/llpolymesh.h @@ -400,6 +400,8 @@ protected: // LLPolySkeletalDeformation // A set of joint scale data for deforming the avatar mesh //----------------------------------------------------------------------------- + +LL_ALIGN_PREFIX(16) class LLPolySkeletalDistortion : public LLViewerVisualParam { public: @@ -436,13 +438,14 @@ public: /*virtual*/ const LLVector4a* getNextDistortion(U32 *index, LLPolyMesh **poly_mesh){index = 0; poly_mesh = NULL; return NULL;}; protected: + LL_ALIGN_16(LLVector4a mDefaultVec); + typedef std::map<LLJoint*, LLVector3> joint_vec_map_t; joint_vec_map_t mJointScales; joint_vec_map_t mJointOffsets; - LLVector4a mDefaultVec; // Backlink only; don't make this an LLPointer. LLVOAvatar *mAvatar; -}; +} LL_ALIGN_POSTFIX(16); #endif // LL_LLPOLYMESH_H |