From 504c645ab6f13d0df35c714534d714e28f9e7534 Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Mon, 9 Sep 2013 15:54:33 -0600
Subject: [PATCH] fix a login crash
---
indra/newview/llvieweroctree.h | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/indra/newview/llvieweroctree.h b/indra/newview/llvieweroctree.h
index 5e3cac260ad..97dc1d4a0ae 100644
--- a/indra/newview/llvieweroctree.h
+++ b/indra/newview/llvieweroctree.h
@@ -210,15 +210,15 @@ class LLviewerOctreeGroup : public LLOctreeListener<LLViewerOctreeEntry>
*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);
--
GitLab