diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-09-12 14:36:37 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-09-12 14:36:37 -0400 |
| commit | 97d969a338c1e4f973eb817ba7701aff51a02ccb (patch) | |
| tree | 7e22b1d1f6fa600196dc9310364e45f563eab68e /indra/newview/llvoavatar.h | |
| parent | 094dc91d0dae4971f6ae89840d791466a6fd6d08 (diff) | |
initial attempt to restore changes that make removing tcmalloc possible; not tested
Diffstat (limited to 'indra/newview/llvoavatar.h')
| -rw-r--r-- | indra/newview/llvoavatar.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index 6fb56a4c0b..4081a1408d 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -93,6 +93,16 @@ protected: **/ public: + void* operator new(size_t size) + { + return ll_aligned_malloc_16(size); + } + + void operator delete(void* ptr) + { + ll_aligned_free_16(ptr); + } + LLVOAvatar(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp); virtual void markDead(); static void initClass(); // Initialize data that's only init'd once per class. @@ -215,7 +225,7 @@ public: bool isBuilt() const { return mIsBuilt; } private: //aligned members - LLVector4a mImpostorExtents[2]; + LL_ALIGN_16(LLVector4a mImpostorExtents[2]); private: BOOL mSupportsAlphaLayers; // For backwards compatibility, TRUE for 1.23+ clients |