11 files changed, 105 insertions, 34 deletions

diff --git a/linden/indra/llmath/llcamera.cpp b/linden/indra/llmath/llcamera.cpp
index 0f343bc..e6b6797 100644
--- a/linden/indra/llmath/llcamera.cpp
+++ b/linden/indra/llmath/llcamera.cpp
@@ -684,6 +684,7 @@ void LLCamera::calculateFrustumPlanes(F32 left, F32 right, F32 top, F32 bottom)
         mLocalPlanes[PLANE_BOTTOM].setVec( a, c, b); 
 
         //calculate center and radius squared of frustum in world absolute coordinates
+        static LLVector3 const X_AXIS(1.f, 0.f, 0.f);
         mFrustCenter = X_AXIS*mFarPlane*0.5f;
         mFrustCenter = transformToAbsolute(mFrustCenter);
         mFrustRadiusSquared = mFarPlane*0.5f;
diff --git a/linden/indra/llmath/llcamera.h b/linden/indra/llmath/llcamera.h
index 23ee115..85b93df 100644
--- a/linden/indra/llmath/llcamera.h
+++ b/linden/indra/llmath/llcamera.h
@@ -56,15 +56,6 @@ const F32 MIN_FAR_PLANE 	= 0.2f;
 static const F32 MIN_FIELD_OF_VIEW = 5.0f * DEG_TO_RAD;
 static const F32 MAX_FIELD_OF_VIEW = 175.f * DEG_TO_RAD;
 
-static const LLVector3 X_AXIS(1.f,0.f,0.f);
-static const LLVector3 Y_AXIS(0.f,1.f,0.f);
-static const LLVector3 Z_AXIS(0.f,0.f,1.f);
-
-static const LLVector3 NEG_X_AXIS(-1.f,0.f,0.f);
-static const LLVector3 NEG_Y_AXIS(0.f,-1.f,0.f);
-static const LLVector3 NEG_Z_AXIS(0.f,0.f,-1.f);
-
-
 // An LLCamera is an LLCoorFrame with a view frustum.
 // This means that it has several methods for moving it around 
 // that are inherited from the LLCoordFrame() class :
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/lloctree.h b/linden/indra/llmath/lloctree.h
index bced84c..2029554 100644
--- a/linden/indra/llmath/lloctree.h
+++ b/linden/indra/llmath/lloctree.h
@@ -68,8 +68,7 @@ template <class T>
 class LLOctreeTraveler : public LLTreeTraveler<T>
 {
 public:
-        virtual void traverse(const LLTreeNode<T>* node);
-        virtual void visit(const LLTreeNode<T>* state) { }
+        virtual void traverse(const LLOctreeNode<T>* node);
         virtual void visit(const LLOctreeNode<T>* branch) = 0;
 };
 
@@ -705,9 +704,8 @@ public:
 //              LLOctreeTraveler
 //========================
 template <class T>
-void LLOctreeTraveler<T>::traverse(const LLTreeNode<T>* tree_node)
+void LLOctreeTraveler<T>::traverse(const LLOctreeNode<T>* node)
 {
-        const LLOctreeNode<T>* node = (const LLOctreeNode<T>*) tree_node;
         node->accept(this);
         for (U32 i = 0; i < node->getChildCount(); i++)
         {
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/lltreenode.h b/linden/indra/llmath/lltreenode.h
index ee98362..ccbeda5 100644
--- a/linden/indra/llmath/lltreenode.h
+++ b/linden/indra/llmath/lltreenode.h
@@ -82,8 +82,6 @@ class LLTreeTraveler
 {
 public:
         virtual ~LLTreeTraveler() { }; 
-        virtual void traverse(const LLTreeNode<T>* node) = 0;
-        virtual void visit(const LLTreeNode<T>* node) = 0;
 };
 
 template <class T>
diff --git a/linden/indra/llmath/llvolume.cpp b/linden/indra/llmath/llvolume.cpp
index 4c94a52..618048c 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)) {
         
                 }
@@ -3577,7 +3583,7 @@ S32 LLVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& end,
         if (face == -1) // ALL_SIDES
         {
                 start_face = 0;
-                end_face = getNumFaces() - 1;
+                end_face = getNumVolumeFaces() - 1;
         }
         else
         {
@@ -4268,7 +4274,7 @@ LLFaceID LLVolume::generateFaceMask()
                 }
                 break;
         default:
-                llerrs << "Unknown profile!" << llendl
+                llerrs << "Unknown profile!" << llendl;
                 break;
         }
 
diff --git a/linden/indra/llmath/llvolume.h b/linden/indra/llmath/llvolume.h
index e55fe52..77af2c4 100644
--- a/linden/indra/llmath/llvolume.h
+++ b/linden/indra/llmath/llvolume.h
@@ -154,6 +154,9 @@ const U8    LL_PCODE_PATH_IGNORE    = 0x00;
 const U8        LL_PCODE_PATH_MIN               = 0x01;         // min/max needs to be >> 4 of real min/max
 const U8    LL_PCODE_PATH_LINE      = 0x10;
 const U8    LL_PCODE_PATH_CIRCLE    = 0x20;
+//<-- Working33 by Gregory Maurer
+const U8    LL_PCODE_PATH_CIRCLE_33 = 0x21;
+//Working33 -->
 const U8    LL_PCODE_PATH_CIRCLE2   = 0x30;
 const U8    LL_PCODE_PATH_TEST      = 0x40;
 const U8    LL_PCODE_PATH_FLEXIBLE  = 0x80;
@@ -902,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.
@@ -942,9 +949,11 @@ public:
         LLVector3                       mLODScaleBias;          // vector for biasing LOD based on scale
         
         void sculpt(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components, const U8* sculpt_data, S32 sculpt_level);
+
+        F32 sculptGetSurfaceArea();
+
 private:
         void sculptGenerateMapVertices(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components, const U8* sculpt_data, U8 sculpt_type);
-        F32 sculptGetSurfaceArea();
         void sculptGeneratePlaceholder();
         void sculptCalcMeshResolution(U16 width, U16 height, U8 type, S32& s, S32& t);
 
diff --git a/linden/indra/llmath/llvolumemgr.cpp b/linden/indra/llmath/llvolumemgr.cpp
index 53641fc..8bfebcb 100644
--- a/linden/indra/llmath/llvolumemgr.cpp
+++ b/linden/indra/llmath/llvolumemgr.cpp
@@ -55,7 +55,7 @@ LLVolumeMgr::LLVolumeMgr()
 {
         // the LLMutex magic interferes with easy unit testing,
         // so you now must manually call useMutex() to use it
-        //mDataMutex = new LLMutex(gAPRPoolp);
+        //mDataMutex = new LLMutex;
 }
 
 LLVolumeMgr::~LLVolumeMgr()
@@ -222,7 +222,7 @@ void LLVolumeMgr::useMutex()
 { 
         if (!mDataMutex)
         {
-                mDataMutex = new LLMutex(gAPRPoolp);
+                mDataMutex = new LLMutex;
         }
 }
 
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)