diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-09-09 15:55:09 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-09-09 15:55:09 -0600 |
| commit | 91aba8feb98fe937da3bd90d5329c2dbb633e8d3 (patch) | |
| tree | 96b245a10cd80220e001733ee26a5f082a3e5d62 /indra | |
| parent | 4f44366731c6fb3bf62c29a5413dc8db86ab4f2e (diff) | |
| parent | 504c645ab6f13d0df35c714534d714e28f9e7534 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llvieweroctree.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/newview/llvieweroctree.h b/indra/newview/llvieweroctree.h index 5e3cac260a..97dc1d4a0a 100644 --- a/indra/newview/llvieweroctree.h +++ b/indra/newview/llvieweroctree.h @@ -210,15 +210,15 @@ public: *this = rhs; } - //void* operator new(size_t size) - //{ - // return ll_aligned_malloc_16(size); - //} - - //void operator delete(void* ptr) - //{ - // ll_aligned_free_16(ptr); - //} + void* operator new(size_t size) + { + return ll_aligned_malloc_16(size); + } + + void operator delete(void* ptr) + { + ll_aligned_free_16(ptr); + } bool removeFromGroup(LLViewerOctreeEntryData* data); bool removeFromGroup(LLViewerOctreeEntry* entry); |