6 files changed, 92 insertions, 14 deletions

diff --git a/linden/indra/llmath/llmath.h b/linden/indra/llmath/llmath.h
index 9f8e539..0de568c 100644
--- a/linden/indra/llmath/llmath.h
+++ b/linden/indra/llmath/llmath.h
@@ -35,6 +35,7 @@
 
 #include <cmath>
 #include <cstdlib>
+#include <complex>
 #include "lldefs.h"
 #include "llstl.h" // *TODO: Remove when LLString is gone
 #include "llstring.h" // *TODO: Remove when LLString is gone
@@ -60,7 +61,9 @@
 #endif
 
 // Single Precision Floating Point Routines
-#if _MSC_VER < 1400
+#ifndef fsqrtf
+#define fsqrtf(x)               ((F32)sqrt((F64)(x)))
+#endif
 #ifndef sqrtf
 #define sqrtf(x)                ((F32)sqrt((F64)(x)))
 #endif
@@ -81,11 +84,6 @@
 #ifndef powf
 #define powf(x,y) ((F32)pow((F64)(x),(F64)(y)))
 #endif
-#endif
-
-#ifndef fsqrtf
-#define fsqrtf(x)               sqrtf(x)
-#endif
 
 const F32       GRAVITY                 = -9.8f;
 
diff --git a/linden/indra/llmath/llrect.h b/linden/indra/llmath/llrect.h
index 9eb58db..33070c4 100644
--- a/linden/indra/llmath/llrect.h
+++ b/linden/indra/llmath/llrect.h
@@ -229,14 +229,14 @@ public:
                 return mLeft <= mRight && mBottom <= mTop;
         }
 
-        bool isNull() const
+        bool isEmpty() const
         {
                 return mLeft == mRight || mBottom == mTop;
         }
 
         bool notNull() const
         {
-                return !isNull();
+                return !isEmpty();
         }
 
         LLRectBase& unionWith(const LLRectBase &other)
diff --git a/linden/indra/llmath/llsdutil_math.h b/linden/indra/llmath/llsdutil_math.h
new file mode 100755
index 0000000..5b64942
--- /dev/null
+++ b/linden/indra/llmath/llsdutil_math.h
@@ -0,0 +1,70 @@
+/** 
+ * @file llsdutil_math.h
+ * @author Brad
+ * @date 2009-05-19
+ * @brief Utility classes, functions, etc, for using structured data with math classes.
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009-2010, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLSDUTIL_MATH_H
+#define LL_LLSDUTIL_MATH_H
+
+class LL_COMMON_API LLSD;
+
+// vector3
+class LLVector3;
+LLSD ll_sd_from_vector3(const LLVector3& vec);
+LLVector3 ll_vector3_from_sd(const LLSD& sd, S32 start_index = 0);
+
+// vector4
+class LLVector4;
+LLSD ll_sd_from_vector4(const LLVector4& vec);
+LLVector4 ll_vector4_from_sd(const LLSD& sd, S32 start_index = 0);
+
+// vector3d (double)
+class LLVector3d;
+LLSD ll_sd_from_vector3d(const LLVector3d& vec);
+LLVector3d ll_vector3d_from_sd(const LLSD& sd, S32 start_index = 0);
+
+// vector2
+class LLVector2;
+LLSD ll_sd_from_vector2(const LLVector2& vec);
+LLVector2 ll_vector2_from_sd(const LLSD& sd);
+
+// Quaternion
+class LLQuaternion;
+LLSD ll_sd_from_quaternion(const LLQuaternion& quat);
+LLQuaternion ll_quaternion_from_sd(const LLSD& sd);
+
+// color4
+class LLColor4;
+LLSD ll_sd_from_color4(const LLColor4& c);
+LLColor4 ll_color4_from_sd(const LLSD& sd);
+
+#endif // LL_LLSDUTIL_MATH_H
diff --git a/linden/indra/llmath/llvolume.cpp b/linden/indra/llmath/llvolume.cpp
index b9b9e0b..c4c3f07 100644
--- a/linden/indra/llmath/llvolume.cpp
+++ b/linden/indra/llmath/llvolume.cpp
@@ -3376,7 +3376,8 @@ void LLVolume::generateSilhouetteVertices(std::vector<LLVector3> &vertices,
                                                                                   std::vector<S32> &segments,
                                                                                   const LLVector3& obj_cam_vec,
                                                                                   const LLMatrix4& mat,
-                                                                                  const LLMatrix3& norm_mat)
+                                                                                  const LLMatrix3& norm_mat,
+                                                                                  S32 face_mask)
 {
         LLMemType m1(LLMemType::MTYPE_VOLUME);
         
@@ -3384,12 +3385,17 @@ void LLVolume::generateSilhouetteVertices(std::vector<LLVector3> &vertices,
         normals.clear();
         segments.clear();
 
+        S32 cur_index = 0;
         //for each face
         for (face_list_t::iterator iter = mVolumeFaces.begin();
                  iter != mVolumeFaces.end(); ++iter)
         {
                 const LLVolumeFace& face = *iter;
         
+                if (!(face_mask & (0x1 << cur_index++)))
+                {
+                        continue;
+                }
                 if (face.mTypeMask & (LLVolumeFace::CAP_MASK)) {
         
                 }
diff --git a/linden/indra/llmath/llvolume.h b/linden/indra/llmath/llvolume.h
index 2b1c60d..0b9002f 100644
--- a/linden/indra/llmath/llvolume.h
+++ b/linden/indra/llmath/llvolume.h
@@ -905,9 +905,13 @@ public:
         // returns number of triangle indeces required for path/profile mesh
         S32 getNumTriangleIndices() const;
 
-        void generateSilhouetteVertices(std::vector<LLVector3> &vertices, std::vector<LLVector3> &normals, std::vector<S32> &segments, const LLVector3& view_vec,
-                                                                                          const LLMatrix4& mat,
-                                                                                  const LLMatrix3& norm_mat);
+        void generateSilhouetteVertices(std::vector<LLVector3> &vertices, 
+                                                                        std::vector<LLVector3> &normals, 
+                                                                        std::vector<S32> &segments, 
+                                                                        const LLVector3& view_vec,
+                                                                        const LLMatrix4& mat,
+                                                                        const LLMatrix3& norm_mat,
+                                                                        S32 face_index);
 
         //get the face index of the face that intersects with the given line segment at the point 
         //closest to start.  Moves end to the point of intersection.  Returns -1 if no intersection.
diff --git a/linden/indra/llmath/v3math.h b/linden/indra/llmath/v3math.h
index 7f96800..8c65d93 100644
--- a/linden/indra/llmath/v3math.h
+++ b/linden/indra/llmath/v3math.h
@@ -411,8 +411,8 @@ inline bool operator<(const LLVector3 &a, const LLVector3 &b)
         return (a.mV[0] < b.mV[0]
                         || (a.mV[0] == b.mV[0]
                                 && (a.mV[1] < b.mV[1]
-                                        || (a.mV[1] == b.mV[1])
-                                                && a.mV[2] < b.mV[2])));
+                                        || ((a.mV[1] == b.mV[1])
+                                                && a.mV[2] < b.mV[2]))));
 }
 
 inline const LLVector3& operator+=(LLVector3 &a, const LLVector3 &b)