diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-09-12 18:44:30 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-09-12 18:44:30 -0400 |
| commit | 3f71d3b41c938fd5d433da6ca1b404586c49c401 (patch) | |
| tree | 0ec16a8f4a8fed65834a0776097f074073cf0fa4 /indra/llmath/lloctree.h | |
| parent | a11cc73736b6824e4dc6d0a693bcfb26514b16eb (diff) | |
| parent | 3a36e3c6a82462b8d01e47707391be168e739b66 (diff) | |
re-merge changes to disable tcmalloc
Diffstat (limited to 'indra/llmath/lloctree.h')
| -rw-r--r-- | indra/llmath/lloctree.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h index 1b11e83b4a..6c7744cdf1 100644 --- a/indra/llmath/lloctree.h +++ b/indra/llmath/lloctree.h @@ -88,7 +88,7 @@ public: typedef LLOctreeNode<T> oct_node; typedef LLOctreeListener<T> oct_listener; - /*void* operator new(size_t size) + void* operator new(size_t size) { return ll_aligned_malloc_16(size); } @@ -96,7 +96,7 @@ public: void operator delete(void* ptr) { ll_aligned_free_16(ptr); - }*/ + } LLOctreeNode( const LLVector4a& center, const LLVector4a& size, |