summaryrefslogtreecommitdiff
path: root/indra/llappearance/llpolymorph.h
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2015-04-28 12:03:31 +0300
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2015-04-28 12:03:31 +0300
commit89321a56fd95ade557be41a07e1b3deaa6162281 (patch)
tree0eee17609e3c72cdc5319f7ee9725214588baf72 /indra/llappearance/llpolymorph.h
parentb2200f06dacfde4fe62a8f7f252e941c65d71c72 (diff)
parentfde0868231a25b8c9ce03a86cb53f1738d35688d (diff)
increment viewer version to 3.7.29
Diffstat (limited to 'indra/llappearance/llpolymorph.h')
-rw-r--r--indra/llappearance/llpolymorph.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/llappearance/llpolymorph.h b/indra/llappearance/llpolymorph.h
index 7e712f9e94..3c2c68079c 100644
--- a/indra/llappearance/llpolymorph.h
+++ b/indra/llappearance/llpolymorph.h
@@ -182,6 +182,16 @@ public:
void applyMask(U8 *maskData, S32 width, S32 height, S32 num_components, BOOL invert);
void addPendingMorphMask() { mNumMorphMasksPending++; }
+ void* operator new(size_t size)
+ {
+ return ll_aligned_malloc_16(size);
+ }
+
+ void operator delete(void* ptr)
+ {
+ ll_aligned_free_16(ptr);
+ }
+
protected:
LLPolyMorphTarget(const LLPolyMorphTarget& pOther);