Merge pull request #1421 from secondlife/DRTVWR-600-maint-A

Drtvwr 600 maint a

1 files changed, 4 insertions, 3 deletions

diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h
index 1242646a8a..bcd33ba2db 100644
--- a/indra/llprimitive/llmodel.h
+++ b/indra/llprimitive/llmodel.h
@@ -256,17 +256,18 @@ public:
 		}
 	};
 
-	
 	//Are the doubles the same w/in epsilon specified tolerance
 	bool areEqual( double a, double b ) 
 	{
 		const float epsilon = 1e-5f;
-		return (fabs((a - b)) < epsilon) ? true : false ;
+		return fabs(a - b) < epsilon;
 	}
+
 	//Make sure that we return false for any values that are within the tolerance for equivalence
 	bool jointPositionalLookup( const LLVector3& a, const LLVector3& b ) 
 	{
-		 return ( areEqual( a[0],b[0]) && areEqual( a[1],b[1] ) && areEqual( a[2],b[2]) ) ? true : false;
+		const float epsilon = 1e-5f;
+		return (a - b).length() < epsilon;
 	}
 
 	//copy of position array for this model -- mPosition[idx].mV[X,Y,Z]