summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-12-19 18:17:18 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-12-19 18:17:18 -0500
commit9c2e0d84f84fe7c38b1e9f7a127efc540b43f5aa (patch)
tree0daaa88c45802db177e722d1c1eaf36cd86871c5 /indra/newview/llvoavatar.h
parente62ad2bf13aa05cb19c2bd72e0d9f59117a6ec84 (diff)
SH-2789 WIP - various fixes to force 16-byte alignment
Diffstat (limited to 'indra/newview/llvoavatar.h')
-rwxr-xr-xindra/newview/llvoavatar.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 82157436b9..20ea3686d6 100755
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -90,6 +90,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.