Merge pull request #891 from secondlife/geenz/mirrors-optimization-pass-1

#682  First mirrors optimization pass

1 files changed, 8 insertions, 1 deletions

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 27d2e6af71..d7af7a42d1 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -296,6 +296,11 @@ void LLVOVolume::markDead()
 		{
 			mLightTexture->removeVolume(LLRender::LIGHT_TEX, this);
 		}
+        
+        if (mIsHeroProbe)
+        {
+            gPipeline.mHeroProbeManager.unregisterViewerObject(this);
+        }
 	}
 	
 	LLViewerObject::markDead();
@@ -4411,7 +4416,9 @@ void LLVOVolume::updateReflectionProbePtr()
 		{
 			// Geenz: This is a special case - what we want here is a hero probe.
 			// What we want to do here is instantiate a hero probe from the hero probe manager.
-            gPipeline.mHeroProbeManager.registerViewerObject(this);
+            
+            if (!mIsHeroProbe)
+                mIsHeroProbe = gPipeline.mHeroProbeManager.registerViewerObject(this);
 		}
     }
     else if (mReflectionProbe.notNull() || getReflectionProbeIsMirror())