diff options
| author | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-07-11 16:15:23 -0700 |
|---|---|---|
| committer | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-07-11 16:15:23 -0700 |
| commit | 173d0fa213f59b872a4a6c34b8668c67b58fdca7 (patch) | |
| tree | 3f02cf0344273dd227b356e3e7768d91cf6786f3 /indra/llmath/lloctree.h | |
| parent | 08c6c5b78d709503e4b5177477046c30495d2d95 (diff) | |
| parent | 9298b1abe9f8b5a7230a5788e86affb22747740d (diff) | |
Pull in viewer-development because it's painful. Merge with runitai's help.
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 6c768863a6..c3f6f7de2a 100644 --- a/indra/llmath/lloctree.h +++ b/indra/llmath/lloctree.h @@ -89,7 +89,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); } @@ -97,7 +97,7 @@ public: void operator delete(void* ptr) { ll_aligned_free_16(ptr); - }*/ + } LLOctreeNode( const LLVector4a& center, const LLVector4a& size, |