From 50b4783ad317b82791273c2d3b6e4260f7a5e77e Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Tue, 20 Apr 2010 19:12:52 +0100 Subject: follow-up fix to ede2c9f28dd5 optimization. for all I know, this fix nerfs the delicate branch optimization, BUT there was a real crash there. :/ (transplanted from e13b292907c5c208e0c96de73b80e203412c5c33) --- indra/newview/pipeline.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 620f34ae53..17c4830a32 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -1966,7 +1966,7 @@ void LLPipeline::markVisible(LLDrawable *drawablep, LLCamera& camera) { LLDrawable* root = ((LLSpatialBridge*) drawablep)->mDrawable; - if (root->getVObj()->isAttachment()) + if (root && root->getVObj()->isAttachment()) { LLVOAvatar* av = root->getParent()->getVObj()->asAvatar(); if (av && av->isImpostor()) -- cgit v1.2.3