diff options
| author | Richard Linden <none@none> | 2013-01-09 23:06:12 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-09 23:06:12 -0800 |
| commit | a09719c0eb8d06d6bb689984a1b108932ea35314 (patch) | |
| tree | 4212c95fdc834b18c9e8aa322daed8266a2fb6fc /indra/newview | |
| parent | 27bec2b2f21f19a7c04707b03f83c8caa855872d (diff) | |
| parent | 1a888f786c274ee6eaed54272718eeef5e685dbf (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lldrawable.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/indra/newview/lldrawable.h b/indra/newview/lldrawable.h index abfdea2699..c22cce246b 100644 --- a/indra/newview/lldrawable.h +++ b/indra/newview/lldrawable.h @@ -61,7 +61,7 @@ const U32 SILHOUETTE_HIGHLIGHT = 0; LL_ALIGN_PREFIX(16) class LLDrawable : public LLRefCount, - public LLTrace::MemTrackable<LLDrawable> + public LLTrace::MemTrackable<LLDrawable, 16> { public: LLDrawable(const LLDrawable& rhs) @@ -77,16 +77,6 @@ public: static void initClass(); - void* operator new(size_t size) - { - return ll_aligned_malloc_16(size); - } - - void operator delete(void* ptr) - { - ll_aligned_free_16(ptr); - } - LLDrawable() { init(); } void markDead(); // Mark this drawable as dead |