From c4fd211cd85febb80158a8540e4ac625387aa515 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Tue, 20 Apr 2010 19:12:52 +0100
Subject: [PATCH] follow-up fix to ede2c9f28dd5 optimization. for all I know,
this fix nerfs the delicate branch optimization, BUT there was a real crash
there. :/
---
indra/newview/pipeline.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index cb656b4fbc7..f54b72ec32c 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -1979,7 +1979,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())
--
GitLab