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
commitcb1ece05ddb71218de4c35df520937ffdda83434 (patch)
tree36834520944456546f20a59635fec7fed2b1e1dc /indra/newview
parent5344d4b2fd89893288243c9a76413a19f90d6f56 (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.
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 cb656b4fbc..368e78dc43 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -1978,9 +1978,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())
{