summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2013-09-09 15:54:33 -0600
committerXiaohong Bao <bao@lindenlab.com>2013-09-09 15:54:33 -0600
commit504c645ab6f13d0df35c714534d714e28f9e7534 (patch)
treea02389a6c80693aa228f7cf57f4aacf70a4987b2 /indra
parent62d40c8d85c57158db226b25bac27f3e77672f8e (diff)
fix a login crash
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llvieweroctree.h18
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);