diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-09 21:17:21 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-09 21:17:21 +0000 |
| commit | 3eadfd1502a8dcb3e04a9455edf24ae54402317a (patch) | |
| tree | 3cef81e98e4c6bd231d070d7032c8369e9493195 /indra/newview/pipeline.cpp | |
| parent | 612de8276a9401e41a6f784ae5b92729a3bfbf15 (diff) | |
| parent | 89df03e8ccada96b691bba938f9df14bf5cfe382 (diff) | |
merge from viewer2.
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 f10f9f9784..a904953e96 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -1977,7 +1977,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; } |