diff options
| author | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-07-31 15:42:02 -0700 |
|---|---|---|
| committer | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-07-31 15:42:02 -0700 |
| commit | 83f5d0c61667ae7682893adbb8939f77b28c2201 (patch) | |
| tree | 081ac47802bf782a8dcd55d7c2fd100ee3f03b89 /indra/llmath/lloctree.h | |
| parent | 7cd5f7d479b889c3dcdb4bcd0ee6b65b5b5a025f (diff) | |
| parent | b8bac66a0f8c392a221ad2c64611e2a55de82339 (diff) | |
Merge in viewer-development
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, |