summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/newview/pipeline.cpp3
1 files changed, 1 insertions, 2 deletions
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