diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-12-15 12:48:07 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-12-15 12:48:07 -0500 |
| commit | e4a1b12e7a9c4bb8cbc2a1e41fddb8cec5a1b1e0 (patch) | |
| tree | a74d7e087c6c440e31e319f76f90beb315a27617 /indra/newview/lldrawable.h | |
| parent | e68d5e248f73180def7c8928b32482347dd91de4 (diff) | |
SH-2789 WIP - build without tcmalloc, force alignment in various places
Diffstat (limited to 'indra/newview/lldrawable.h')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/lldrawable.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/lldrawable.h b/indra/newview/lldrawable.h index e268640a21..244b87b2e7 100644..100755 --- a/indra/newview/lldrawable.h +++ b/indra/newview/lldrawable.h @@ -59,6 +59,7 @@ class LLViewerTexture; const U32 SILHOUETTE_HIGHLIGHT = 0; // All data for new renderer goes into this class. +LL_ALIGN_PREFIX(16) class LLDrawable : public LLRefCount { public: @@ -280,8 +281,8 @@ public: } EDrawableFlags; private: //aligned members - LLVector4a mExtents[2]; - LLVector4a mPositionGroup; + LL_ALIGN_16(LLVector4a mExtents[2]); + LL_ALIGN_16(LLVector4a mPositionGroup); public: LLXformMatrix mXform; @@ -322,7 +323,7 @@ private: static U32 sNumZombieDrawables; static LLDynamicArrayPtr<LLPointer<LLDrawable> > sDeadList; -}; +} LL_ALIGN_POSTFIX(16); inline LLFace* LLDrawable::getFace(const S32 i) const |