diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-02-09 12:53:50 -0800 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-02-09 12:53:50 -0800 |
| commit | 89df03e8ccada96b691bba938f9df14bf5cfe382 (patch) | |
| tree | bdeff7db79e1786ba1da41a3dcee031bcedf078a /indra/newview/pipeline.cpp | |
| parent | 9a19daccd0a8a711ce01b140febf5fc632df0e57 (diff) | |
| parent | 13e395aef2225601124d1df3ec4764859e8718f5 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
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; } |