summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-20 19:12:52 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-20 19:12:52 +0100
commitc4fd211cd85febb80158a8540e4ac625387aa515 (patch)
tree3a65629e9786b433a84f1bf385a3db6e0bd31dc5 /indra
parent003eaf41247d4e648ef3b90ff5da1cb798334df9 (diff)
follow-up fix to ede2c9f28dd5 optimization. for all I know, this fix nerfs the delicate branch optimization, BUT there was a real crash there. :/
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/pipeline.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index cb656b4fbc..f54b72ec32 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())