Automated merge with ssh://hg.lindenlab.com/bao/bao-viewer-interesting/

1 files changed, 0 insertions, 13 deletions

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index c782fbfe7e..1b7a98ba54 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -1473,19 +1473,6 @@ void LLSpatialBridge::shiftPos(const LLVector4a& vec)
 
 void LLSpatialBridge::cleanupReferences()
 {	
-	LLPointer<LLVOCacheEntry> dummy_entry;
-	if (mDrawable && mDrawable->isDead() && mDrawable->getEntry()->hasVOCacheEntry())
-	{
-		//create a dummy entry to insert the entire LLSpatialBridge to the vo_cache partition so it can be reloaded.
-
-		dummy_entry = new LLVOCacheEntry();
-		dummy_entry->setOctreeEntry(mEntry);
-		dummy_entry->addChild((LLVOCacheEntry*)mDrawable->getEntry()->getVOCacheEntry());
-		//llassert(!mDrawable->getParent());
-		
-		//mDrawable->mParent = this;
-	}
-
 	LLDrawable::cleanupReferences();
 	if (mDrawable)
 	{