livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automated merge with http://bitbucket.org/lindenlab/viewer-interesting

master
Xiaohong Bao 2013-09-09 15:55:09 -06:00
parent 4f44366731 504c645ab6
commit 91aba8feb9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llvieweroctree.h
View File

@ -210,15 +210,15 @@ public:
*this = rhs;
}
//void* operator new(size_t size)
//{
// return ll_aligned_malloc_16(size);
//}
void* operator new(size_t size)
{
return ll_aligned_malloc_16(size);
}
//void operator delete(void* ptr)
//{
// ll_aligned_free_16(ptr);
//}
void operator delete(void* ptr)
{
ll_aligned_free_16(ptr);
}
bool removeFromGroup(LLViewerOctreeEntryData* data);
bool removeFromGroup(LLViewerOctreeEntry* entry);