diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-09-20 18:48:15 -0700 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-09-20 18:48:15 -0700 |
| commit | 29cdf94e95d0a4365bd18860c4759f9a6a13f45a (patch) | |
| tree | 39e86ea1f7cb8e05547416d303d63dbbeab85937 /indra/newview/lldriverparam.h | |
| parent | 5ec24ecd69986eada6e185e922df5a82bc7dd48d (diff) | |
Correcting dynamic allocation issues with classes that have aligned data members.
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 |