2 files changed, 25 insertions, 4 deletions

diff --git a/linden/indra/llmath/llvolumemgr.cpp b/linden/indra/llmath/llvolumemgr.cpp
index 0b49bb3..0b5464c 100644
--- a/linden/indra/llmath/llvolumemgr.cpp
+++ b/linden/indra/llmath/llvolumemgr.cpp
@@ -77,11 +77,8 @@ BOOL LLVolumeMgr::cleanup()
                  iter != end; iter++)
         {
                 LLVolumeLODGroup *volgroupp = iter->second;
-                if (volgroupp->getNumRefs() != 0)
+                if (volgroupp->cleanupRefs() == false)
                 {
-                        llwarns << "Volume group " << volgroupp << " has " 
-                                        << volgroupp->getNumRefs() << " remaining refs" << llendl;
-                        llwarns << *volgroupp->getVolumeParams() << llendl;
                         no_refs = FALSE;
                 }
                 delete volgroupp;
@@ -274,6 +271,29 @@ LLVolumeLODGroup::~LLVolumeLODGroup()
         }
 }
 
+// Called from LLVolumeMgr::cleanup
+bool LLVolumeLODGroup::cleanupRefs()
+{
+        bool res = true;
+        if (mRefs != 0)
+        {
+                llwarns << "Volume group has remaining refs:" << getNumRefs() << llendl;
+                mRefs = 0;
+                for (S32 i = 0; i < NUM_LODS; i++)
+                {
+                        if (mLODRefs[i] > 0)
+                        {
+                                llwarns << " LOD " << i << " refs = " << mLODRefs[i] << llendl;
+                                mLODRefs[i] = 0;
+                                mVolumeLODs[i] = NULL;
+                        }
+                }
+                llwarns << *getVolumeParams() << llendl;
+                res = false;
+        }
+        return res;
+}
+
 LLVolume* LLVolumeLODGroup::getLODVolume(const S32 detail)
 {
         llassert(detail >=0 && detail < NUM_LODS);
diff --git a/linden/indra/llmath/llvolumemgr.h b/linden/indra/llmath/llvolumemgr.h
index 8f107f6..dcaca01 100644
--- a/linden/indra/llmath/llvolumemgr.h
+++ b/linden/indra/llmath/llvolumemgr.h
@@ -53,6 +53,7 @@ public:
 
         LLVolumeLODGroup(const LLVolumeParams &params);
         ~LLVolumeLODGroup();
+        bool cleanupRefs();
 
         static S32 getDetailFromTan(const F32 tan_angle);
         static void getDetailProximity(const F32 tan_angle, F32 &to_lower, F32& to_higher);