diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-02-10 15:24:27 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-02-10 15:24:27 +0200 |
| commit | efee637e3bf1a13591d83e6cbf52acc483a6e61a (patch) | |
| tree | c8c00a42d491523dae3c187884e5cb65e01f9a4f /indra/newview/pipeline.cpp | |
| parent | d3d389c69898c597746902f3875761f03a419800 (diff) | |
| parent | 22dccc74a8fbcf3231d932db39781727833b9259 (diff) | |
Merge from default branch
--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; } |