diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-10-17 19:33:09 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-10-17 19:33:09 -0700 |
| commit | ec9260701feaa9ae1453c57f0f70449bb9b60af2 (patch) | |
| tree | 9a6e74ee503c956dc8f13851f3ff0da712861b08 /indra/newview/lldriverparam.h | |
| parent | e56145176875a09dc9e1524a47bcc1259582c896 (diff) | |
| parent | 49ad7fd4b57cec635c557070be02556094e90ff6 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/lldriverparam.h')
| -rw-r--r-- | indra/newview/lldriverparam.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/lldriverparam.h b/indra/newview/lldriverparam.h index 7a4d711d4e..c0976d1d43 100644 --- a/indra/newview/lldriverparam.h +++ b/indra/newview/lldriverparam.h @@ -83,6 +83,16 @@ public: LLDriverParam(LLWearable *wearablep); ~LLDriverParam(); + 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 LLDriverParamInfo* getInfo() const { return (LLDriverParamInfo*)mInfo; } // This sets mInfo and calls initialization functions |