1 files changed, 10 insertions, 9 deletions

diff --git a/linden/indra/newview/llspatialpartition.cpp b/linden/indra/newview/llspatialpartition.cpp
index 283b38b..00bb724 100644
--- a/linden/indra/newview/llspatialpartition.cpp
+++ b/linden/indra/newview/llspatialpartition.cpp
@@ -71,7 +71,7 @@ void sg_assert(BOOL expr)
 #endif
 }
 
-#if !LL_RELEASE_FOR_DOWNLOAD
+#if LL_DEBUG
 void validate_drawable(LLDrawable* drawablep)
 {
         F64 rad = drawablep->getBinRadius();
@@ -153,10 +153,6 @@ LLSpatialGroup::~LLSpatialGroup()
 
 void LLSpatialGroup::clearDrawMap()
 {
-        for (LLSpatialGroup::draw_map_t::iterator i = mDrawMap.begin(); i != mDrawMap.end(); ++i)
-        {
-                std::for_each(i->second.begin(), i->second.end(), DeletePointer());
-        }
         mDrawMap.clear();
 }
 
@@ -2323,7 +2319,7 @@ void pushVerts(LLSpatialGroup* group, U32 mask)
 
         for (LLSpatialGroup::draw_map_t::iterator i = group->mDrawMap.begin(); i != group->mDrawMap.end(); ++i)
         {
-                for (std::vector<LLDrawInfo*>::iterator j = i->second.begin(); j != i->second.end(); ++j)
+                for (LLSpatialGroup::drawmap_elem_t::iterator j = i->second.begin(); j != i->second.end(); ++j) 
                 {
                         params = *j;
                         pushVerts(params, mask);
@@ -2351,7 +2347,7 @@ void pushVertsColorCoded(LLSpatialGroup* group, U32 mask)
 
         for (LLSpatialGroup::draw_map_t::iterator i = group->mDrawMap.begin(); i != group->mDrawMap.end(); ++i)
         {
-                for (std::vector<LLDrawInfo*>::iterator j = i->second.begin(); j != i->second.end(); ++j)
+                for (LLSpatialGroup::drawmap_elem_t::iterator j = i->second.begin(); j != i->second.end(); ++j) 
                 {
                         params = *j;
                         glColor4f(colors[col].mV[0], colors[col].mV[1], colors[col].mV[2], 0.5f);
@@ -2702,8 +2698,8 @@ public:
                 
                 for (LLSpatialGroup::draw_map_t::iterator i = group->mDrawMap.begin(); i != group->mDrawMap.end(); ++i)
                 {
-                        std::vector<LLDrawInfo*>& draw_vec = i->second;
-                        for (std::vector<LLDrawInfo*>::iterator j = draw_vec.begin(); j != draw_vec.end(); ++j)
+                        LLSpatialGroup::drawmap_elem_t& draw_vec = i->second;   
+                        for (LLSpatialGroup::drawmap_elem_t::iterator j = draw_vec.begin(); j != draw_vec.end(); ++j)   
                         {
                                 LLDrawInfo* draw_info = *j;
                                 if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_TEXTURE_ANIM))
@@ -2889,6 +2885,11 @@ LLDrawInfo::LLDrawInfo(U32 start, U32 end, U32 count, U32 offset,
 {
 }
 
+LLDrawInfo::~LLDrawInfo()       
+{
+
+}
+
 LLVertexBuffer* LLGeometryManager::createVertexBuffer(U32 type_mask, U32 usage)
 {
         return new LLVertexBuffer(type_mask, usage);