diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-06-12 11:30:43 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-06-12 11:30:43 -0600 |
| commit | db2abd49c3b41af612cbb6fed4c1626c37b4e14b (patch) | |
| tree | 8ac8f1ed83d96ba1c8b6bafe38b81cedb6dee2dc /indra/newview | |
| parent | 427490edb566edf18da0b879f9d30a04dda0e9e0 (diff) | |
fix for SH-4244: interesting: objects on adjacent region are not visible.
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llvocache.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp index 5e2d2efc5e..1f3af78e77 100755 --- a/indra/newview/llvocache.cpp +++ b/indra/newview/llvocache.cpp @@ -417,9 +417,11 @@ public: virtual S32 frustumCheck(const LLviewerOctreeGroup* group) { +#if 1 S32 res = AABBInRegionFrustumGroupBounds(group); - - //S32 res = AABBInRegionFrustumNoFarClipGroupBounds(group); +#else + S32 res = AABBInRegionFrustumNoFarClipGroupBounds(group); +#endif if (res != 0) { res = llmin(res, AABBRegionSphereIntersectGroupExtents(group, mLocalShift)); @@ -429,9 +431,11 @@ public: virtual S32 frustumCheckObjects(const LLviewerOctreeGroup* group) { +#if 1 S32 res = AABBInRegionFrustumObjectBounds(group); - - //S32 res = AABBInRegionFrustumNoFarClipObjectBounds(group); +#else + S32 res = AABBInRegionFrustumNoFarClipObjectBounds(group); +#endif if (res != 0) { res = llmin(res, AABBRegionSphereIntersectObjectExtents(group, mLocalShift)); |