diff --git a/indra/newview/llviewerpartsim.cpp b/indra/newview/llviewerpartsim.cpp index 83c49084a1..f7eb7df46c 100755 --- a/indra/newview/llviewerpartsim.cpp +++ b/indra/newview/llviewerpartsim.cpp @@ -41,8 +41,6 @@ #include "llspatialpartition.h" #include "llvovolume.h" -#include "nd/ndobjectpool.h" // For operator new/delete - const F32 PART_SIM_BOX_SIDE = 16.f; const F32 PART_SIM_BOX_OFFSET = 0.5f*PART_SIM_BOX_SIDE; const F32 PART_SIM_BOX_RAD = 0.5f*F_SQRT3*PART_SIM_BOX_SIDE; @@ -894,20 +892,3 @@ void LLViewerPartSim::clearParticlesByOwnerID(const LLUUID& task_id) } } -// Object pool for LLViewerPart - -// Assume this is singlethreaded (nd::locks::NoLock) 16 byte aligned and allocate 128 objects per chunk -nd::objectpool::ObjectPool< LLViewerPart, nd::locks::NoLock, 16, 128 > sViewerpartPool; - -void* LLViewerPart::operator new(size_t size) -{ - llassert_always( size == sizeof(LLViewerPart) ); - return sViewerpartPool.allocMemoryForObject(); -} - -void LLViewerPart::operator delete(void* ptr) -{ - sViewerpartPool.freeMemoryOfObject( ptr ); -} - -// diff --git a/indra/newview/llviewerpartsim.h b/indra/newview/llviewerpartsim.h index bddf517d0b..40e8e1d45d 100755 --- a/indra/newview/llviewerpartsim.h +++ b/indra/newview/llviewerpartsim.h @@ -81,11 +81,6 @@ public: static U32 sNextPartID; - - // Object pool for LLViewerPart - void* operator new(size_t size); - void operator delete(void* ptr); - // };