diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-02-09 15:56:42 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-02-09 15:56:42 -0800 |
| commit | 22193b15b82d1a6f0ce8846d122bf3ddcefbf13e (patch) | |
| tree | c6c2b595b3e6c518bcf5450e56fb470fa5c07dba /indra/newview/pipeline.cpp | |
| parent | f040942f190cfdf10ee577a9b4f6a5c83e752e00 (diff) | |
| parent | 465a3356a2f32362837d5231a21b9151f45f890b (diff) | |
Merge
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; } |