diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-22 14:52:02 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-22 14:52:02 +0100 |
| commit | ff341ac55263c7fc14ef034aeb8aa2af04cfba49 (patch) | |
| tree | 2bf20ca421a03e63928d86553381bdcb14f078e7 /indra/newview/pipeline.cpp | |
| parent | a1421a90e62abff60298ff07666db9664a3e89d1 (diff) | |
Stop asserting one of the markDirty paths which really happens in the wild.
(transplanted from fe2be2242fe59806989f9784a3797e2d5f69442f)
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 3 |
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 |