diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-10 20:04:47 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-10 20:04:47 +0200 |
| commit | d86c69c7380704a34b22d88511df124ca357d5c1 (patch) | |
| tree | 3bc740e62f53b29dab84622a0a8b37dcdeaeaa85 /indra/newview/pipeline.cpp | |
| parent | e8610200433ef636bbd0b594afe9543cebc06689 (diff) | |
| parent | d7140c95e3a667ea5d659802956bc0aa5acfda41 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -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 4f4fc83819..bd22fc5f2e 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -1970,7 +1970,7 @@ void LLPipeline::markVisible(LLDrawable *drawablep, LLCamera& camera) if (root && root->getParent() && root->getVObj() && root->getVObj()->isAttachment()) { LLVOAvatar* av = root->getParent()->getVObj()->asAvatar(); - if (av->isImpostor()) + if (av && av->isImpostor()) { return; } |