diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-09-12 16:41:48 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-09-12 16:41:48 -0600 |
| commit | 75f5efff9bc29380bae5a3febd5e2bd169aaff79 (patch) | |
| tree | 8561fd94629488c247395745585cacc286225bd0 /indra/newview/llvieweroctree.cpp | |
| parent | 420a1af0c86113a7db291022373b69c2b8810c7c (diff) | |
| parent | 605060ea022670f4ff6f8850f79495032095b58e (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llvieweroctree.cpp')
| -rw-r--r-- | indra/newview/llvieweroctree.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/newview/llvieweroctree.cpp b/indra/newview/llvieweroctree.cpp index 1e01c0fdef..2457f15b50 100644 --- a/indra/newview/llvieweroctree.cpp +++ b/indra/newview/llvieweroctree.cpp @@ -1132,7 +1132,7 @@ static LLTrace::TimeBlock FTM_OCCLUSION_SET_BUFFER("Set Buffer"); static LLTrace::TimeBlock FTM_OCCLUSION_DRAW_WATER("Draw Water"); static LLTrace::TimeBlock FTM_OCCLUSION_DRAW("Draw"); -void LLOcclusionCullingGroup::doOcclusion(LLCamera* camera, const LLVector3* region_agent) +void LLOcclusionCullingGroup::doOcclusion(LLCamera* camera, const LLVector4a* shift) { if (mSpatialPartition->isOcclusionEnabled() && LLPipeline::sUseOcclusion > 1) { @@ -1140,11 +1140,9 @@ void LLOcclusionCullingGroup::doOcclusion(LLCamera* camera, const LLVector3* reg LLVector4a bounds[2]; bounds[0] = mBounds[0]; bounds[1] = mBounds[1]; - if(region_agent != NULL) + if(shift != NULL) { - LLVector4a shift((*region_agent)[0], (*region_agent)[1], (*region_agent)[2]); - bounds[0].sub(shift); - bounds[1].sub(shift); + bounds[0].add(*shift); } // Don't cull hole/edge water, unless we have the GL_ARB_depth_clamp extension |