summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawable.cpp
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2014-01-31 18:24:55 -0700
committerXiaohong Bao <bao@lindenlab.com>2014-01-31 18:24:55 -0700
commitb49170b732e6e4b2cf11b40c12b3d75a8709cf5c (patch)
treed89f953347dffdf990ba0c666d0748f1176a89d5 /indra/newview/lldrawable.cpp
parent3455bf958908037e6d8fcb2956d2cebcdee6ae2d (diff)
fix some flaws for memory corruption
Diffstat (limited to 'indra/newview/lldrawable.cpp')
-rwxr-xr-xindra/newview/lldrawable.cpp11
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.
}