diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2012-10-25 16:13:39 -0700 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2012-10-25 16:13:39 -0700 |
| commit | 0cdff2817bdc342e0ac8b3c8711e3f7a72f1f617 (patch) | |
| tree | 0fbaca9292450f05588336eb6639b12d182156e1 /indra/newview/llpolymesh.h | |
| parent | 03fa24f8aecc071bac920a400c122cbce0b029b4 (diff) | |
| parent | 1743e6a81330824021667000f8acdd6cf64dbf1b (diff) | |
Merge
Diffstat (limited to 'indra/newview/llpolymesh.h')
| -rw-r--r-- | indra/newview/llpolymesh.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llpolymesh.h b/indra/newview/llpolymesh.h index ffb11a3f7e..850171d169 100644 --- a/indra/newview/llpolymesh.h +++ b/indra/newview/llpolymesh.h @@ -406,6 +406,16 @@ public: LLPolySkeletalDistortion(LLVOAvatar *avatarp); ~LLPolySkeletalDistortion(); + void* operator new(size_t size) + { + return ll_aligned_malloc_16(size); + } + + void operator delete(void* ptr) + { + ll_aligned_free_16(ptr); + } + // Special: These functions are overridden by child classes LLPolySkeletalDistortionInfo* getInfo() const { return (LLPolySkeletalDistortionInfo*)mInfo; } // This sets mInfo and calls initialization functions |