diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2014-01-09 21:18:37 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2014-01-09 21:18:37 -0700 |
| commit | 3455bf958908037e6d8fcb2956d2cebcdee6ae2d (patch) | |
| tree | fa3df0deac893a308a191ba4fc3881a84db74c02 /indra/newview/pipeline.cpp | |
| parent | 15e6939342956f830996299352bcf7fffa7c3b85 (diff) | |
| parent | 87f852ee67c75ac415ce716157bdd9ba94c60441 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rwxr-xr-x | indra/newview/pipeline.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index c4fa80f0a2..da1048ac78 100755 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -2786,7 +2786,8 @@ void LLPipeline::doOcclusion(LLCamera& camera, LLRenderTarget& source, LLRenderT void LLPipeline::doOcclusion(LLCamera& camera) { - if (LLPipeline::sUseOcclusion > 1 && (sCull->hasOcclusionGroups() || LLVOCachePartition::sNeedsOcclusionCheck)) + if (LLPipeline::sUseOcclusion > 1 && !LLSpatialPartition::sTeleportRequested && + (sCull->hasOcclusionGroups() || LLVOCachePartition::sNeedsOcclusionCheck)) { LLVertexBuffer::unbind(); |