diff options
author | Dave Parks <davep@lindenlab.com> | 2012-08-31 14:12:12 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2012-08-31 14:12:12 -0500 |
commit | c1c80133a29b97112c887a75252fafe7a70d9a78 (patch) | |
tree | a12482c97cd86cdd23eab675b319e4f993781ee8 /indra/newview/llpolymorph.h | |
parent | ff92759181615babd91c41b1a980561dd631f4d9 (diff) | |
parent | de1d297deaedaeff212eb2ff13ec4edef21ce633 (diff) |
merge
Diffstat (limited to 'indra/newview/llpolymorph.h')
-rw-r--r-- | indra/newview/llpolymorph.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/indra/newview/llpolymorph.h b/indra/newview/llpolymorph.h index 46e23b7792..792ce62290 100644 --- a/indra/newview/llpolymorph.h +++ b/indra/newview/llpolymorph.h @@ -41,6 +41,7 @@ class LLWearable; //----------------------------------------------------------------------------- // LLPolyMorphData() //----------------------------------------------------------------------------- +LL_ALIGN_PREFIX(16) class LLPolyMorphData { public: @@ -48,6 +49,16 @@ public: ~LLPolyMorphData(); LLPolyMorphData(const LLPolyMorphData &rhs); + void* operator new(size_t size) + { + return ll_aligned_malloc_16(size); + } + + void operator delete(void* ptr) + { + ll_aligned_free_16(ptr); + } + BOOL loadBinary(LLFILE* fp, LLPolyMeshSharedData *mesh); const std::string& getName() { return mName; } @@ -65,9 +76,9 @@ public: F32 mTotalDistortion; // vertex distortion summed over entire morph F32 mMaxDistortion; // maximum single vertex distortion in a given morph - LLVector4a mAvgDistortion; // average vertex distortion, to infer directionality of the morph + LL_ALIGN_16(LLVector4a mAvgDistortion); // average vertex distortion, to infer directionality of the morph LLPolyMeshSharedData* mMesh; -}; +} LL_ALIGN_POSTFIX(16); //----------------------------------------------------------------------------- // LLPolyVertexMask() |