diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-27 14:18:22 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-27 14:18:22 -0400 |
| commit | 2c3e78f1f1f5851482e5e63d37af1325f3a19550 (patch) | |
| tree | 1871ea15c18377defe5e20a198baf8072e791efc /indra/llmath/lloctree.h | |
| parent | eb03da6e993eb33e1fef9bf53268c66d325adf9a (diff) | |
| parent | c9f1b1b5113031d5879e8fcdcec263626a7d3122 (diff) | |
merge changes for DRTVWR-167
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, |