summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-22 14:52:02 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-22 14:52:02 +0100
commit2c07b128520ccbd748a8bf3d9dcdbbf3a7099ee3 (patch)
tree15b7dfc1a413fa5aae8f0c7d927833f09650ce61
parentd1910d93eb1f1e07362e99f68a0f69a664867e0d (diff)
Stop asserting one of the markDirty paths which really happens in the wild.
-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 44c95a4fd6..a36f6831c3 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -1983,8 +1983,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