diff options
| author | Richard Linden <none@none> | 2013-09-16 21:12:18 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-09-16 21:12:18 -0700 |
| commit | fc8c3a4cf7368ad7ee78e817e8c116d09b7377d0 (patch) | |
| tree | 7513b7d0b5651d5de6e1ca4873efdc4689d5245b /indra/newview/llvieweroctree.cpp | |
| parent | 5f7f84c7acb686659b2bdc9a018b18c2b23db3d0 (diff) | |
| parent | fb82d0c4dbb6f6e3c58cca6ab69d638bda851b34 (diff) | |
merge
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 2149acbc3b..30658c57bf 100644 --- a/indra/newview/llvieweroctree.cpp +++ b/indra/newview/llvieweroctree.cpp @@ -1146,7 +1146,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) { @@ -1154,11 +1154,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 |