diff options
author | Richard Linden <none@none> | 2013-10-07 13:38:03 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2013-10-07 13:38:03 -0700 |
commit | 17df8988fec3f2ba991ca9e34ff8148253a2fc04 (patch) | |
tree | d06a8919e3ad5a56aa37c9706f05e33bf5b188f0 /indra/newview/llvoavatar.h | |
parent | bee38adb347213bc1824dad8a762dc399c3065ec (diff) |
renamed TraceType to StatType
added more MemTrackable types
optimized memory usage of LLTrace some more
Diffstat (limited to 'indra/newview/llvoavatar.h')
-rwxr-xr-x | indra/newview/llvoavatar.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index b600d2a8f1..6800fe3785 100755 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -97,12 +97,12 @@ public: public: void* operator new(size_t size) { - return ll_aligned_malloc_16(size); + return LLTrace::MemTrackable<LLViewerObject>::aligned_new<16>(size); } - void operator delete(void* ptr) + void operator delete(void* ptr, size_t size) { - ll_aligned_free_16(ptr); + LLTrace::MemTrackable<LLViewerObject>::aligned_delete<16>(ptr, size); } LLVOAvatar(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp); |