5 files changed, 28 insertions, 28 deletions

diff --git a/linden/indra/llmath/llcamera.cpp b/linden/indra/llmath/llcamera.cpp
index 2197066..c32bb67 100644
--- a/linden/indra/llmath/llcamera.cpp
+++ b/linden/indra/llmath/llcamera.cpp
@@ -506,7 +506,7 @@ void LLCamera::calcAgentFrustumPlanes(LLVector3* frust)
         mAgentPlanes[3] = planeFromPoints(frust[1], frust[0], frust[4]);
 
         //cache plane octant facing mask for use in AABBInFrustum
-        for (int i = 0; i < 8; i++)
+        for (int i = 0; i < 6; i++)
         {
                 U8 mask = 0;
                 LLPlane p = mAgentPlanes[i];
diff --git a/linden/indra/llmath/llmath.h b/linden/indra/llmath/llmath.h
index dbd825d..dd44e0c 100644
--- a/linden/indra/llmath/llmath.h
+++ b/linden/indra/llmath/llmath.h
@@ -99,6 +99,27 @@ inline BOOL is_approx_equal(F32 x, F32 y)
         return (abs((S32) ((U32&)x - (U32&)y) ) < COMPARE_MANTISSA_UP_TO_BIT);
 }
 
+inline BOOL is_approx_equal_fraction(F32 x, F32 y, U32 frac_bits)
+{
+        BOOL ret = TRUE;
+        F32 diff = (F32) fabs(x - y);
+
+        S32 diffInt = (S32) diff;
+        S32 diffFracTolerance = (S32) ((diff - (F32) diffInt) * (1 << frac_bits));
+        
+        // if integer portion is not equal, not enough bits were used for packing
+        // so error out since either the use case is not correct OR there is
+        // an issue with pack/unpack. should fail in either case.
+        // for decimal portion, make sure that the delta is no more than 1
+        // based on the number of bits used for packing decimal portion.
+        if (diffInt != 0 || diffFracTolerance > 1)
+        {
+                ret = FALSE;
+        }
+
+        return ret;
+}
+
 inline S32 llabs(const S32 a)
 {
         return S32(labs(a));
diff --git a/linden/indra/llmath/llrand.cpp b/linden/indra/llmath/llrand.cpp
index f62bd71..e6c4cc5 100644
--- a/linden/indra/llmath/llrand.cpp
+++ b/linden/indra/llmath/llrand.cpp
@@ -106,7 +106,7 @@ inline F64 ll_internal_random_double()
         // occasionally give an obviously incorrect random number -- like
         // 5^15 or something. Sooooo, clamp it as described above.
         F64 rv = gRandomGenerator();
-        if(!((rv >= 0.0) && (rv < 1.0))) return 0.0;
+        if(!((rv >= 0.0) && (rv < 1.0))) return fmod(rv, 1.0);
         return rv;
 }
 
@@ -114,7 +114,7 @@ inline F32 ll_internal_random_float()
 {
         // The clamping rules are described above.
         F32 rv = (F32)gRandomGenerator();
-        if(!((rv >= 0.0f) && (rv < 1.0f))) return 0.0f;
+        if(!((rv >= 0.0f) && (rv < 1.0f))) return fmod(rv, 1.f);
         return rv;
 }
 #endif
diff --git a/linden/indra/llmath/lluuid.cpp b/linden/indra/llmath/lluuid.cpp
index 78dc8e6..0fed6b3 100644
--- a/linden/indra/llmath/lluuid.cpp
+++ b/linden/indra/llmath/lluuid.cpp
@@ -486,7 +486,7 @@ S32 LLUUID::getNodeID(unsigned char * node_id)
           Ncb.ncb_command = NCBASTAT;
           Ncb.ncb_lana_num = lenum.lana[i];
 
-          strcpy( (char *)Ncb.ncb_callname,  "*               " );              /* Flawfinder: ignore */
+          strcpy( (char *)Ncb.ncb_callname,  "*              " );               /* Flawfinder: ignore */
           Ncb.ncb_buffer = (unsigned char *)&Adapter;
           Ncb.ncb_length = sizeof(Adapter);
 
diff --git a/linden/indra/llmath/llvolume.cpp b/linden/indra/llmath/llvolume.cpp
index bb3b24d..89644a5 100644
--- a/linden/indra/llmath/llvolume.cpp
+++ b/linden/indra/llmath/llvolume.cpp
@@ -742,10 +742,6 @@ BOOL LLProfileParams::importFile(FILE *fp)
                         buffer,
                         " %255s %255s",
                         keyword, valuestr);
-                if (!keyword)
-                {
-                        continue;
-                }
                 if (!strcmp("{", keyword))
                 {
                         continue;
@@ -818,10 +814,6 @@ BOOL LLProfileParams::importLegacyStream(std::istream& input_stream)
                         " %255s %255s",
                         keyword,
                         valuestr);
-                if (!keyword)
-                {
-                        continue;
-                }
                 if (!strcmp("{", keyword))
                 {
                         continue;
@@ -1245,10 +1237,6 @@ BOOL LLPathParams::importFile(FILE *fp)
                         buffer,
                         " %255s %255s",
                         keyword, valuestr);
-                if (!keyword)
-                {
-                        continue;
-                }
                 if (!strcmp("{", keyword))
                 {
                         continue;
@@ -1389,10 +1377,6 @@ BOOL LLPathParams::importLegacyStream(std::istream& input_stream)
                         buffer,
                         " %255s %255s",
                         keyword, valuestr);
-                if (!keyword)
-                {
-                        continue;
-                }
                 if (!strcmp("{", keyword))
                 {
                         continue;
@@ -3287,6 +3271,9 @@ BOOL LLVolume::cleanupTriangleData( const S32 num_input_vertices,
         if (new_num_triangles == 0)
         {
                 llwarns << "Created volume object with 0 faces." << llendl;
+                delete[] new_triangles;
+                delete[] vertex_mapping;
+                delete[] new_vertices;
                 return FALSE;
         }
 
@@ -3381,10 +3368,6 @@ BOOL LLVolumeParams::importFile(FILE *fp)
         {
                 fgets(buffer, BUFSIZE, fp);
                 sscanf(buffer, " %255s", keyword);      /* Flawfinder: ignore */
-                if (!keyword)
-                {
-                        continue;
-                }
                 if (!strcmp("{", keyword))
                 {
                         continue;
@@ -3435,10 +3418,6 @@ BOOL LLVolumeParams::importLegacyStream(std::istream& input_stream)
         {
                 input_stream.getline(buffer, BUFSIZE);
                 sscanf(buffer, " %255s", keyword);
-                if (!keyword)
-                {
-                        continue;
-                }
                 if (!strcmp("{", keyword))
                 {
                         continue;