From 04d2f64aa7eb679975fc672d932af1472b7feb8f Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Thu, 22 Apr 2010 14:52:02 +0100 Subject: Stop asserting one of the markDirty paths which really happens in the wild. (transplanted from fe2be2242fe59806989f9784a3797e2d5f69442f) --- indra/newview/pipeline.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/newview/pipeline.cpp') diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index af0aa41ca5..7a9a47feab 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -1970,8 +1970,7 @@ void LLPipeline::markVisible(LLDrawable *drawablep, LLCamera& camera) root->getVObj()->isAttachment()) { LLDrawable* rootparent = root->getParent(); - llassert(rootparent); // trying to catch a bad assumption - if (rootparent) // this test may not be needed, see above + if (rootparent) // this IS sometimes NULL { LLViewerObject *vobj = rootparent->getVObj(); llassert(vobj); // trying to catch a bad assumption -- cgit v1.2.3