diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-20 19:12:52 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-20 19:12:52 +0100 |
| commit | 1e904da79c3eaa28cf53b63f306cc7482df77a95 (patch) | |
| tree | 1482b8fa2d8c824b3036cb549f19acba097b74f1 | |
| parent | 5aa958818f93e2f8b4ab2451e8fffceb740258c9 (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. :/
(transplanted from e13b292907c5c208e0c96de73b80e203412c5c33)
| -rw-r--r-- | indra/newview/pipeline.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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()) |