1 files changed, 24 insertions, 0 deletions

diff --git a/linden/indra/llmath/llcamera.cpp b/linden/indra/llmath/llcamera.cpp
index e6b6797..9c37fcf 100644
--- a/linden/indra/llmath/llcamera.cpp
+++ b/linden/indra/llmath/llcamera.cpp
@@ -246,6 +246,10 @@ S32 LLCamera::AABBInFrustum(const LLVector3 &center, const LLVector3& radius)
                 for (U32 i = 0; i < mPlaneCount; i++)
                 {
                         mask = mAgentPlanes[i].mask;
+                        if (mask == 0xff)
+                        {
+                                continue;
+                        } 
                         LLPlane p = mAgentPlanes[i].p;
                         LLVector3 n = LLVector3(p);
                         float d = p.mV[3];
@@ -294,6 +298,10 @@ S32 LLCamera::AABBInFrustumNoFarClip(const LLVector3 &center, const LLVector3& r
                 }
 
                 mask = mAgentPlanes[i].mask;
+                if (mask == 0xff)
+                {
+                        continue;
+                } 
                 LLPlane p = mAgentPlanes[i].p;
                 LLVector3 n = LLVector3(p);
                 float d = p.mV[3];
@@ -437,6 +445,11 @@ int LLCamera::sphereInFrustum(const LLVector3 &sphere_center, const F32 radius)
         int res = 2;
         for (int i = 0; i < 6; i++)
         {
+                if (mAgentPlanes[i].mask == 0xff)
+                {
+                        continue;
+                } 
+
                 float d = mAgentPlanes[i].p.dist(sphere_center);
 
                 if (d > radius) 
@@ -622,6 +635,17 @@ U8 LLCamera::calcPlaneMask(const LLPlane& plane)
         return mask;
 }
 
+void LLCamera::ignoreAgentFrustumPlane(S32 idx)
+{
+        if (idx < 0 || idx > (S32) mPlaneCount)
+        {
+                return;
+        }
+
+        mAgentPlanes[idx].mask = 0xff;
+        mAgentPlanes[idx].p.clearVec();
+}
+
 void LLCamera::calcAgentFrustumPlanes(LLVector3* frust)
 {