Automated merge with http://bitbucket.org/lindenlab/viewer-interesting

1 files changed, 6 insertions, 5 deletions

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 7414b24811..c56006d9a3 100755
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -128,13 +128,14 @@ void LLDrawable::init(bool new_entry)
 		{
 			vo_entry->setOctreeEntry(mEntry);
 		}
-		else if(vo_entry->getNumOfChildren() > 0)
-		{
-			getRegion()->addVisibleCacheEntry(vo_entry); //to load all children.
-		}
-	
+		
 		getRegion()->addActiveCacheEntry(vo_entry);
 
+		if(vo_entry->getNumOfChildren() > 0)
+		{
+			getRegion()->addVisibleChildCacheEntry(vo_entry, NULL); //to load all children.
+		}		
+
 		llassert(!vo_entry->getGroup()); //not in the object cache octree.
 	}