diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-06-10 22:43:29 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-06-10 22:43:29 -0600 |
| commit | 427490edb566edf18da0b879f9d30a04dda0e9e0 (patch) | |
| tree | 9e8333fcaf19fb3b6aef18366d7aa80d1f7479b8 /indra/newview/lldrawable.cpp | |
| parent | ebf35d51b14f224c36a19a453a20885e667f6bec (diff) | |
possible fix and new debug code for SH-4241: viewer crash shortly after login in LLViewerRegion::addNewObject
Diffstat (limited to 'indra/newview/lldrawable.cpp')
| -rwxr-xr-x | indra/newview/lldrawable.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index 93fb484f06..598b0d2ff4 100755 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -133,7 +133,9 @@ void LLDrawable::init(bool new_entry) getRegion()->addVisibleCacheEntry(vo_entry); //to load all children. } - getRegion()->addActiveCacheEntry(vo_entry); + getRegion()->addActiveCacheEntry(vo_entry); + + llassert_always(!vo_entry->getGroup()); //not in the object cache octree. } llassert(!vo_entry || vo_entry->getEntry() == mEntry); |