summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-20 22:50:58 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-20 22:50:58 +0100
commit4e9826093217872450282a60ba07ee245ecd864c (patch)
tree6d8cd0ffc5dabff6beee68128993f40bd1c28e70 /indra/newview
parent1f009f2be9f06cdd13cf7ae586a006333cf5452e (diff)
Another try at finding the new markVisible() crasher without de-optimizing it too badly. Sprinkle it with asserts for the sanity checks we've started to skip, see which one (ones?) fires.
(transplanted from 09164f83f03cfa62d0fd8296c810d3e3794cb365)
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/pipeline.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 620f34ae53..8295490677 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -1965,9 +1965,11 @@ void LLPipeline::markVisible(LLDrawable *drawablep, LLCamera& camera)
if (drawablep->isSpatialBridge())
{
LLDrawable* root = ((LLSpatialBridge*) drawablep)->mDrawable;
-
+ llassert(root);
if (root->getVObj()->isAttachment())
{
+ llassert(root->getParent());
+ llassert(root->getParent()->getVObj());
LLVOAvatar* av = root->getParent()->getVObj()->asAvatar();
if (av && av->isImpostor())
{