56 files changed, 239 insertions, 64 deletions

diff --git a/linden/indra/llmath/camera.h b/linden/indra/llmath/camera.h
index e9963e9..3aa86d5 100644
--- a/linden/indra/llmath/camera.h
+++ b/linden/indra/llmath/camera.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2000-2007 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
diff --git a/linden/indra/llmath/coordframe.h b/linden/indra/llmath/coordframe.h
index 81d630e..611387d 100644
--- a/linden/indra/llmath/coordframe.h
+++ b/linden/indra/llmath/coordframe.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2000-2007 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
diff --git a/linden/indra/llmath/llbboxlocal.cpp b/linden/indra/llmath/llbboxlocal.cpp
index b197241..505c7e6 100644
--- a/linden/indra/llmath/llbboxlocal.cpp
+++ b/linden/indra/llmath/llbboxlocal.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, 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
diff --git a/linden/indra/llmath/llbboxlocal.h b/linden/indra/llmath/llbboxlocal.h
index cb71a4f..4fdc01f 100644
--- a/linden/indra/llmath/llbboxlocal.h
+++ b/linden/indra/llmath/llbboxlocal.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, 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
diff --git a/linden/indra/llmath/llcamera.cpp b/linden/indra/llmath/llcamera.cpp
index bc13c90..2197066 100644
--- a/linden/indra/llmath/llcamera.cpp
+++ b/linden/indra/llmath/llcamera.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2000-2007, 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
diff --git a/linden/indra/llmath/llcamera.h b/linden/indra/llmath/llcamera.h
index 82b6130..b5f78f4 100644
--- a/linden/indra/llmath/llcamera.h
+++ b/linden/indra/llmath/llcamera.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2000-2007, 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
diff --git a/linden/indra/llmath/llcoord.h b/linden/indra/llmath/llcoord.h
index 6aa6b64..a1ed130 100644
--- a/linden/indra/llmath/llcoord.h
+++ b/linden/indra/llmath/llcoord.h
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2001-2007, 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
diff --git a/linden/indra/llmath/llcoordframe.cpp b/linden/indra/llmath/llcoordframe.cpp
index c7d18bb..1650dd2 100644
--- a/linden/indra/llmath/llcoordframe.cpp
+++ b/linden/indra/llmath/llcoordframe.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2000-2007, 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
diff --git a/linden/indra/llmath/llcoordframe.h b/linden/indra/llmath/llcoordframe.h
index d15f3e5..2777cbe 100644
--- a/linden/indra/llmath/llcoordframe.h
+++ b/linden/indra/llmath/llcoordframe.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2000-2007, 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
diff --git a/linden/indra/llmath/llcrc.cpp b/linden/indra/llmath/llcrc.cpp
index 1c0aa5d..cc0f955 100644
--- a/linden/indra/llmath/llcrc.cpp
+++ b/linden/indra/llmath/llcrc.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2002-2007, 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
diff --git a/linden/indra/llmath/llcrc.h b/linden/indra/llmath/llcrc.h
index 7c267d6..06ddac2 100644
--- a/linden/indra/llmath/llcrc.h
+++ b/linden/indra/llmath/llcrc.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2002-2007, 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
diff --git a/linden/indra/llmath/llinterp.h b/linden/indra/llmath/llinterp.h
index 3cc0b18..724fb31 100644
--- a/linden/indra/llmath/llinterp.h
+++ b/linden/indra/llmath/llinterp.h
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2001-2007, 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
diff --git a/linden/indra/llmath/llmath.h b/linden/indra/llmath/llmath.h
index 7009557..dbd825d 100644
--- a/linden/indra/llmath/llmath.h
+++ b/linden/indra/llmath/llmath.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2000-2007, 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
diff --git a/linden/indra/llmath/llmath.vcproj b/linden/indra/llmath/llmath.vcproj
index 82feb25..4876065 100644
--- a/linden/indra/llmath/llmath.vcproj
+++ b/linden/indra/llmath/llmath.vcproj
@@ -224,9 +224,6 @@
                         Filter="h;hpp;hxx;hm;inl;inc;xsd"
                         UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
                         <File
-                                RelativePath=".\linden_math.h">
-                        </File>
-                        <File
                                 RelativePath=".\llbboxlocal.h">
                         </File>
                         <File
@@ -245,6 +242,9 @@
                                 RelativePath=".\llinterp.h">
                         </File>
                         <File
+                                RelativePath=".\llmath.h">
+                        </File>
+                        <File
                                 RelativePath=".\llmd5.h">
                         </File>
                         <File
diff --git a/linden/indra/llmath/llmd5.cpp b/linden/indra/llmath/llmd5.cpp
index 267381c..aad4617 100644
--- a/linden/indra/llmath/llmd5.cpp
+++ b/linden/indra/llmath/llmd5.cpp
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2001-2007, 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
@@ -258,7 +259,7 @@ LLMD5::LLMD5(const unsigned char *string, const unsigned int number)
         init();
         update(string, (U32)strlen((const char *) string));             /* Flawfinder: ignore */
         update((const unsigned char *) colon, (U32)strlen(colon));              /* Flawfinder: ignore */
-        snprintf(tbuf, sizeof(tbuf), "%i", number);             /* Flawfinder: ignore */
+        snprintf(tbuf, sizeof(tbuf), "%i", number);     /* Flawfinder: ignore */
         update((const unsigned char *) tbuf, (U32)strlen(tbuf));        /* Flawfinder: ignore */
         finalize();
 }
diff --git a/linden/indra/llmath/llmd5.h b/linden/indra/llmath/llmd5.h
index 7b185b6..20c32ed 100644
--- a/linden/indra/llmath/llmd5.h
+++ b/linden/indra/llmath/llmd5.h
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2001-2007, 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
diff --git a/linden/indra/llmath/lloctree.h b/linden/indra/llmath/lloctree.h
index 22f298c..81b9d8c 100644
--- a/linden/indra/llmath/lloctree.h
+++ b/linden/indra/llmath/lloctree.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2005-2007, 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
diff --git a/linden/indra/llmath/llperlin.cpp b/linden/indra/llmath/llperlin.cpp
index 553b6a1..38b4d0d 100644
--- a/linden/indra/llmath/llperlin.cpp
+++ b/linden/indra/llmath/llperlin.cpp
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2001-2007, 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
diff --git a/linden/indra/llmath/llperlin.h b/linden/indra/llmath/llperlin.h
index dcd6506..e5fc4b0 100644
--- a/linden/indra/llmath/llperlin.h
+++ b/linden/indra/llmath/llperlin.h
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2001-2007, 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
diff --git a/linden/indra/llmath/llplane.h b/linden/indra/llmath/llplane.h
index 44721f3..0e0e17d 100644
--- a/linden/indra/llmath/llplane.h
+++ b/linden/indra/llmath/llplane.h
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2001-2007, 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
diff --git a/linden/indra/llmath/llquantize.h b/linden/indra/llmath/llquantize.h
index 6045911..a4fd67a 100644
--- a/linden/indra/llmath/llquantize.h
+++ b/linden/indra/llmath/llquantize.h
@@ -5,6 +5,7 @@
  *
  * Copyright (c) 2001-2007, 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
diff --git a/linden/indra/llmath/llquaternion.cpp b/linden/indra/llmath/llquaternion.cpp
index 1111ca5..abc9e42 100644
--- a/linden/indra/llmath/llquaternion.cpp
+++ b/linden/indra/llmath/llquaternion.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2000-2007, 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
diff --git a/linden/indra/llmath/llquaternion.h b/linden/indra/llmath/llquaternion.h
index 1e3f2b6..66a8b40 100644
--- a/linden/indra/llmath/llquaternion.h
+++ b/linden/indra/llmath/llquaternion.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2000-2007, 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
diff --git a/linden/indra/llmath/llrand.cpp b/linden/indra/llmath/llrand.cpp
index ae52010..f62bd71 100644
--- a/linden/indra/llmath/llrand.cpp
+++ b/linden/indra/llmath/llrand.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2000-2007, 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
diff --git a/linden/indra/llmath/llrand.h b/linden/indra/llmath/llrand.h
index 1bf055e..4a3dca6 100644
--- a/linden/indra/llmath/llrand.h
+++ b/linden/indra/llmath/llrand.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2000-2007, 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
diff --git a/linden/indra/llmath/llrect.cpp b/linden/indra/llmath/llrect.cpp
index 390573e..d9efe45 100644
--- a/linden/indra/llmath/llrect.cpp
+++ b/linden/indra/llmath/llrect.cpp
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2001-2007, 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
diff --git a/linden/indra/llmath/llrect.h b/linden/indra/llmath/llrect.h
index fd45d3c..a17ab39 100644
--- a/linden/indra/llmath/llrect.h
+++ b/linden/indra/llmath/llrect.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, 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
diff --git a/linden/indra/llmath/lltreenode.h b/linden/indra/llmath/lltreenode.h
index ba3c867..a42a156 100644
--- a/linden/indra/llmath/lltreenode.h
+++ b/linden/indra/llmath/lltreenode.h
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2005-2007, 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
diff --git a/linden/indra/llmath/lluuid.cpp b/linden/indra/llmath/lluuid.cpp
index b943fd9..78dc8e6 100644
--- a/linden/indra/llmath/lluuid.cpp
+++ b/linden/indra/llmath/lluuid.cpp
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2000-2007, 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
@@ -174,6 +175,11 @@ void LLUUID::toCompressedString(char *out) const
         out[UUID_BYTES] = '\0';
 }
 
+std::string LLUUID::getString() const
+{
+        return asString();
+}
+
 std::string LLUUID::asString() const
 {
         char str[UUID_STR_SIZE];                /* Flawfinder: ignore */
diff --git a/linden/indra/llmath/lluuid.h b/linden/indra/llmath/lluuid.h
index aeda734..99cd585 100644
--- a/linden/indra/llmath/lluuid.h
+++ b/linden/indra/llmath/lluuid.h
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2000-2007, 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
@@ -104,6 +105,7 @@ public:
         void toCompressedString(char *out) const;       // Does not allocate memory, needs 17 characters (including \0)
 
         std::string asString() const;
+        std::string getString() const;
 
         U16 getCRC16() const;
         U32 getCRC32() const;
diff --git a/linden/indra/llmath/llvolume.cpp b/linden/indra/llmath/llvolume.cpp
index e42413a..bb3b24d 100644
--- a/linden/indra/llmath/llvolume.cpp
+++ b/linden/indra/llmath/llvolume.cpp
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2002-2007, 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
@@ -215,7 +216,7 @@ void LLProfile::genNGon(S32 sides, F32 offset, F32 bevel, F32 ang_scale, S32 spl
         t_fraction = (begin - t_first)*sides;
 
         // Only use if it's not almost exactly on an edge.
-        if (t_fraction < 0.99f)
+        if (t_fraction < 0.9999f)
         {
                 LLVector3 new_pt = lerp(pt1, pt2, t_fraction);
                 F32 pt_x = new_pt.mV[VX];
@@ -266,7 +267,7 @@ void LLProfile::genNGon(S32 sides, F32 offset, F32 bevel, F32 ang_scale, S32 spl
 
         // Find the fraction that we need to add to the end point.
         t_fraction = (end - (t - t_step))*sides;
-        if (t_fraction > 0.01f)
+        if (t_fraction > 0.0001f)
         {
                 LLVector3 new_pt = lerp(pt1, pt2, t_fraction);
                 F32 pt_x = new_pt.mV[VX];
diff --git a/linden/indra/llmath/llvolume.h b/linden/indra/llmath/llvolume.h
index 91f7c9b..7137346 100644
--- a/linden/indra/llmath/llvolume.h
+++ b/linden/indra/llmath/llvolume.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2002-2007, 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
@@ -61,12 +62,12 @@ const S32 MAX_LOD = 3;
 const F32 MIN_VOLUME_PROFILE_WIDTH      = 0.05f;
 const F32 MIN_VOLUME_PATH_WIDTH         = 0.05f;
 
-const F32 CUT_QUANTA   = 0.005f;
-const F32 SCALE_QUANTA = 0.01f;
-const F32 SHEAR_QUANTA = 0.01f;
-const F32 TAPER_QUANTA = 0.01f;
-const F32 REV_QUANTA   = 0.015f;
-
+const F32 CUT_QUANTA    = 0.00002f;
+const F32 SCALE_QUANTA  = 0.01f;
+const F32 SHEAR_QUANTA  = 0.01f;
+const F32 TAPER_QUANTA  = 0.01f;
+const F32 REV_QUANTA    = 0.015f;
+const F32 HOLLOW_QUANTA = 0.00002f;
 
 //============================================================================
 
@@ -184,7 +185,7 @@ public:
         {
         }
 
-        LLProfileParams(U8 curve, U8 begin, U8 end, U8 hollow)
+        LLProfileParams(U8 curve, U16 begin, U16 end, U16 hollow)
         {
                 mCurveType = curve;
                 F32 temp_f32 = begin * CUT_QUANTA;
@@ -199,7 +200,7 @@ public:
                         temp_f32 = 1.f;
                 }
                 mEnd = 1.f - temp_f32;
-                temp_f32 = hollow * SCALE_QUANTA;
+                temp_f32 = hollow * HOLLOW_QUANTA;
                 if (temp_f32 > 1.f)
                 {
                         temp_f32 = 1.f;
@@ -229,9 +230,9 @@ public:
         const U8&   getCurveType () const                       { return mCurveType; }
 
         void setCurveType(const U32 type)                       { mCurveType = type;}
-        void setBegin(const F32 begin)                          { mBegin = (begin >= 1.0f) ? 0.0f : ((int) (begin * 1000))/1000.0f;}
-        void setEnd(const F32 end)                                      { mEnd   = (end   <= 0.0f) ? 1.0f : ((int) (end * 1000))/1000.0f;}
-        void setHollow(const F32 hollow)                        { mHollow = ((int) (hollow * 1000))/1000.0f;}
+        void setBegin(const F32 begin)                          { mBegin = (begin >= 1.0f) ? 0.0f : ((int) (begin * 100000))/100000.0f;}
+        void setEnd(const F32 end)                                      { mEnd   = (end   <= 0.0f) ? 1.0f : ((int) (end * 100000))/100000.0f;}
+        void setHollow(const F32 hollow)                        { mHollow = ((int) (hollow * 100000))/100000.0f;}
 
         friend std::ostream& operator<<(std::ostream &s, const LLProfileParams &profile_params);
 
@@ -315,11 +316,11 @@ public:
                 mTaper.setVec(tx,ty);
         }
 
-        LLPathParams(U8 curve, U8 begin, U8 end, U8 scx, U8 scy, U8 shx, U8 shy, U8 twistend, U8 twistbegin, U8 radiusoffset, U8 tx, U8 ty, U8 revolutions, U8 skew)
+        LLPathParams(U8 curve, U16 begin, U16 end, U8 scx, U8 scy, U8 shx, U8 shy, U8 twistend, U8 twistbegin, U8 radiusoffset, U8 tx, U8 ty, U8 revolutions, U8 skew)
         {
                 mCurveType = curve;
-                mBegin = (F32)(begin * SCALE_QUANTA);
-                mEnd = (F32)(100.f - end) * SCALE_QUANTA;
+                mBegin = (F32)(begin * CUT_QUANTA);
+                mEnd = (F32)(100.f - end) * CUT_QUANTA;
                 if (mEnd > 1.f)
                         mEnd = 1.f;
                 mScale.setVec((F32) (200 - scx) * SCALE_QUANTA,(F32) (200 - scy) * SCALE_QUANTA);
diff --git a/linden/indra/llmath/llvolumemgr.cpp b/linden/indra/llmath/llvolumemgr.cpp
index 2aa480c..eac407f 100644
--- a/linden/indra/llmath/llvolumemgr.cpp
+++ b/linden/indra/llmath/llvolumemgr.cpp
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2002-2007, 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
@@ -297,7 +298,7 @@ F32 LLVolumeLODGroup::dump()
         }
         usage = usage / (F32)NUM_LODS;
 
-        snprintf(dump_str, sizeof(dump_str), "%.3f %d %d %d %d", usage, mAccessCount[0], mAccessCount[1], mAccessCount[2], mAccessCount[3]);            /* Flawfinder: ignore */
+        snprintf(dump_str, sizeof(dump_str), "%.3f %d %d %d %d", usage, mAccessCount[0], mAccessCount[1], mAccessCount[2], mAccessCount[3]);    /* Flawfinder: ignore */
 
         llinfos << dump_str << llendl;
         return usage;
diff --git a/linden/indra/llmath/llvolumemgr.h b/linden/indra/llmath/llvolumemgr.h
index 9cb1f63..aa00c4e 100644
--- a/linden/indra/llmath/llvolumemgr.h
+++ b/linden/indra/llmath/llvolumemgr.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2002-2007, 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
diff --git a/linden/indra/llmath/m3math.cpp b/linden/indra/llmath/m3math.cpp
index 4d93af6..09a18d2 100644
--- a/linden/indra/llmath/m3math.cpp
+++ b/linden/indra/llmath/m3math.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2000-2007, 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
diff --git a/linden/indra/llmath/m3math.h b/linden/indra/llmath/m3math.h
index 494856a..94c9b65 100644
--- a/linden/indra/llmath/m3math.h
+++ b/linden/indra/llmath/m3math.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2000-2007, 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
diff --git a/linden/indra/llmath/m4math.cpp b/linden/indra/llmath/m4math.cpp
index ee7e6f3..b6d91a1 100644
--- a/linden/indra/llmath/m4math.cpp
+++ b/linden/indra/llmath/m4math.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2000-2007, 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
@@ -673,31 +674,55 @@ LLVector4 operator*(const LLMatrix4 &a, const LLVector4 &b)
 }
 */
 
+// Operates "to the left" on row-vector a
+//
+// This used to be in the header file but was not actually inlined in practice.
+// When avatar vertex programs are off, this function is a hot spot in profiles
+// due to software skinning in LLViewerJointMesh::updateGeometry().  JC
+LLVector3 operator*(const LLVector3 &a, const LLMatrix4 &b)
+{
+        // This is better than making a temporary LLVector3.  This eliminates an
+        // unnecessary LLVector3() constructor and also helps the compiler to
+        // realize that the output floats do not alias the input floats, hence
+        // eliminating redundant loads of a.mV[0], etc.  JC
+        return LLVector3(a.mV[VX] * b.mMatrix[VX][VX] + 
+                                         a.mV[VY] * b.mMatrix[VY][VX] + 
+                                         a.mV[VZ] * b.mMatrix[VZ][VX] +
+                                         b.mMatrix[VW][VX],
+                                         
+                                         a.mV[VX] * b.mMatrix[VX][VY] + 
+                                         a.mV[VY] * b.mMatrix[VY][VY] + 
+                                         a.mV[VZ] * b.mMatrix[VZ][VY] +
+                                         b.mMatrix[VW][VY],
+                                         
+                                         a.mV[VX] * b.mMatrix[VX][VZ] + 
+                                         a.mV[VY] * b.mMatrix[VY][VZ] + 
+                                         a.mV[VZ] * b.mMatrix[VZ][VZ] +
+                                         b.mMatrix[VW][VZ]);
+}
 
 LLVector4 operator*(const LLVector4 &a, const LLMatrix4 &b)
 {
         // Operate "to the left" on row-vector a
-        LLVector4       vec;
-        vec.mV[VX] = a.mV[VX] * b.mMatrix[VX][VX] + 
-                                 a.mV[VY] * b.mMatrix[VY][VX] + 
-                                 a.mV[VZ] * b.mMatrix[VZ][VX] +
-                                 a.mV[VW] * b.mMatrix[VW][VX];
-
-        vec.mV[VY] = a.mV[VX] * b.mMatrix[VX][VY] + 
-                                 a.mV[VY] * b.mMatrix[VY][VY] + 
-                                 a.mV[VZ] * b.mMatrix[VZ][VY] +
-                                 a.mV[VW] * b.mMatrix[VW][VY];
-
-        vec.mV[VZ] = a.mV[VX] * b.mMatrix[VX][VZ] + 
-                                 a.mV[VY] * b.mMatrix[VY][VZ] + 
-                                 a.mV[VZ] * b.mMatrix[VZ][VZ] +
-                                 a.mV[VW] * b.mMatrix[VW][VZ];
-
-        vec.mV[VW] = a.mV[VX] * b.mMatrix[VX][VW] + 
-                                 a.mV[VY] * b.mMatrix[VY][VW] + 
-                                 a.mV[VZ] * b.mMatrix[VZ][VW] +
-                                 a.mV[VW] * b.mMatrix[VW][VW];
-        return vec;
+        return LLVector4(a.mV[VX] * b.mMatrix[VX][VX] + 
+                                         a.mV[VY] * b.mMatrix[VY][VX] + 
+                                         a.mV[VZ] * b.mMatrix[VZ][VX] +
+                                         a.mV[VW] * b.mMatrix[VW][VX],
+
+                                         a.mV[VX] * b.mMatrix[VX][VY] + 
+                                         a.mV[VY] * b.mMatrix[VY][VY] + 
+                                         a.mV[VZ] * b.mMatrix[VZ][VY] +
+                                         a.mV[VW] * b.mMatrix[VW][VY],
+
+                                         a.mV[VX] * b.mMatrix[VX][VZ] + 
+                                         a.mV[VY] * b.mMatrix[VY][VZ] + 
+                                         a.mV[VZ] * b.mMatrix[VZ][VZ] +
+                                         a.mV[VW] * b.mMatrix[VW][VZ],
+
+                                         a.mV[VX] * b.mMatrix[VX][VW] + 
+                                         a.mV[VY] * b.mMatrix[VY][VW] + 
+                                         a.mV[VZ] * b.mMatrix[VZ][VW] +
+                                         a.mV[VW] * b.mMatrix[VW][VW]);
 }
 
 LLVector4 rotate_vector(const LLVector4 &a, const LLMatrix4 &b)
diff --git a/linden/indra/llmath/m4math.h b/linden/indra/llmath/m4math.h
index 7de29ed..24f9f86 100644
--- a/linden/indra/llmath/m4math.h
+++ b/linden/indra/llmath/m4math.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2000-2007, 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
@@ -266,27 +267,6 @@ inline const LLMatrix4&	LLMatrix4::identity()
         return (*this);
 }
 
-inline LLVector3 operator*(const LLVector3 &a, const LLMatrix4 &b)
-{
-        // Converts a to LLVector4 and applies full transformation
-        // Operates "to the left" on row-vector a
-        LLVector3       vec;
-        vec.mV[VX] = a.mV[VX] * b.mMatrix[VX][VX] + 
-                                 a.mV[VY] * b.mMatrix[VY][VX] + 
-                                 a.mV[VZ] * b.mMatrix[VZ][VX] +
-                                 b.mMatrix[VW][VX];
-
-        vec.mV[VY] = a.mV[VX] * b.mMatrix[VX][VY] + 
-                                 a.mV[VY] * b.mMatrix[VY][VY] + 
-                                 a.mV[VZ] * b.mMatrix[VZ][VY] +
-                                 b.mMatrix[VW][VY];
-
-        vec.mV[VZ] = a.mV[VX] * b.mMatrix[VX][VZ] + 
-                                 a.mV[VY] * b.mMatrix[VY][VZ] + 
-                                 a.mV[VZ] * b.mMatrix[VZ][VZ] +
-                                 b.mMatrix[VW][VZ];
-        return vec;
-}
 
 /*
 inline LLMatrix4 operator*(const LLMatrix4 &a, const LLMatrix4 &b)
diff --git a/linden/indra/llmath/raytrace.cpp b/linden/indra/llmath/raytrace.cpp
index 64bf616..634542d 100644
--- a/linden/indra/llmath/raytrace.cpp
+++ b/linden/indra/llmath/raytrace.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, 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
diff --git a/linden/indra/llmath/raytrace.h b/linden/indra/llmath/raytrace.h
index 58cca69..f68002f 100644
--- a/linden/indra/llmath/raytrace.h
+++ b/linden/indra/llmath/raytrace.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, 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
diff --git a/linden/indra/llmath/v2math.cpp b/linden/indra/llmath/v2math.cpp
index cee0f73..e41227b 100644
--- a/linden/indra/llmath/v2math.cpp
+++ b/linden/indra/llmath/v2math.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2000-2007, 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
diff --git a/linden/indra/llmath/v2math.h b/linden/indra/llmath/v2math.h
index c978fc0..bcfe016 100644
--- a/linden/indra/llmath/v2math.h
+++ b/linden/indra/llmath/v2math.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2000-2007, 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
diff --git a/linden/indra/llmath/v3color.cpp b/linden/indra/llmath/v3color.cpp
index 9428093..5464a0b 100644
--- a/linden/indra/llmath/v3color.cpp
+++ b/linden/indra/llmath/v3color.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2000-2007, 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
@@ -61,3 +62,52 @@ std::ostream& operator<<(std::ostream& s, const LLColor3 &a)
         s << "{ " << a.mV[VX] << ", " << a.mV[VY] << ", " << a.mV[VZ] << " }";
         return s;
 }
+
+void LLColor3::calcHSL(F32* hue, F32* saturation, F32* luminance) const
+{
+        F32 var_R = mV[VRED];
+        F32 var_G = mV[VGREEN];
+        F32 var_B = mV[VBLUE];
+
+        F32 var_Min = ( var_R < ( var_G < var_B ? var_G : var_B ) ? var_R : ( var_G < var_B ? var_G : var_B ) );
+        F32 var_Max = ( var_R > ( var_G > var_B ? var_G : var_B ) ? var_R : ( var_G > var_B ? var_G : var_B ) );
+
+        F32 del_Max = var_Max - var_Min;
+
+        F32 L = ( var_Max + var_Min ) / 2.0f;
+        F32 H = 0.0f;
+        F32 S = 0.0f;
+
+        if ( del_Max == 0.0f )
+        {
+           H = 0.0f;
+           S = 0.0f;
+        }
+        else
+        {
+                if ( L < 0.5 )
+                        S = del_Max / ( var_Max + var_Min );
+                else
+                        S = del_Max / ( 2.0f - var_Max - var_Min );
+
+                F32 del_R = ( ( ( var_Max - var_R ) / 6.0f ) + ( del_Max / 2.0f ) ) / del_Max;
+                F32 del_G = ( ( ( var_Max - var_G ) / 6.0f ) + ( del_Max / 2.0f ) ) / del_Max;
+                F32 del_B = ( ( ( var_Max - var_B ) / 6.0f ) + ( del_Max / 2.0f ) ) / del_Max;
+
+                if ( var_R >= var_Max )
+                        H = del_B - del_G;
+                else
+                if ( var_G >= var_Max )
+                        H = ( 1.0f / 3.0f ) + del_R - del_B;
+                else
+                if ( var_B >= var_Max )
+                        H = ( 2.0f / 3.0f ) + del_G - del_R;
+
+                if ( H < 0.0f ) H += 1.0f;
+                if ( H > 1.0f ) H -= 1.0f;
+        }
+
+        if (hue) *hue = H;
+        if (saturation) *saturation = S;
+        if (luminance) *luminance = L;
+}
\ No newline at end of file
diff --git a/linden/indra/llmath/v3color.h b/linden/indra/llmath/v3color.h
index 06a94db..8f9224d 100644
--- a/linden/indra/llmath/v3color.h
+++ b/linden/indra/llmath/v3color.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, 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
@@ -71,6 +72,8 @@ public:
                 mV[1] = (F32) sd[1].asReal();;
                 mV[2] = (F32) sd[2].asReal();;
         }
+
+        void calcHSL(F32* hue, F32* saturation, F32* luminance) const;
         
         const LLColor3& setToBlack();                                   // Clears LLColor3 to (0, 0, 0)
         const LLColor3& setToWhite();                                   // Zero LLColor3 to (0, 0, 0)
diff --git a/linden/indra/llmath/v3dmath.cpp b/linden/indra/llmath/v3dmath.cpp
index 5d3aad0..059f9c6 100644
--- a/linden/indra/llmath/v3dmath.cpp
+++ b/linden/indra/llmath/v3dmath.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2000-2007, 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
diff --git a/linden/indra/llmath/v3dmath.h b/linden/indra/llmath/v3dmath.h
index da13cc3..c101cc8 100644
--- a/linden/indra/llmath/v3dmath.h
+++ b/linden/indra/llmath/v3dmath.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2000-2007, 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
diff --git a/linden/indra/llmath/v3math.cpp b/linden/indra/llmath/v3math.cpp
index a97b6d8..f42fe1c 100644
--- a/linden/indra/llmath/v3math.cpp
+++ b/linden/indra/llmath/v3math.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2000-2007, 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
diff --git a/linden/indra/llmath/v3math.h b/linden/indra/llmath/v3math.h
index e7134eb..bf211e2 100644
--- a/linden/indra/llmath/v3math.h
+++ b/linden/indra/llmath/v3math.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2000-2007, 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
diff --git a/linden/indra/llmath/v4color.cpp b/linden/indra/llmath/v4color.cpp
index 2732a60..281e5f1 100644
--- a/linden/indra/llmath/v4color.cpp
+++ b/linden/indra/llmath/v4color.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2000-2007, 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
@@ -224,6 +225,55 @@ LLColor4	vec3to4(const LLColor3 &vec)
         return temp;
 }
 
+void LLColor4::calcHSL(F32* hue, F32* saturation, F32* luminance) const
+{
+        F32 var_R = mV[VRED];
+        F32 var_G = mV[VGREEN];
+        F32 var_B = mV[VBLUE];
+
+        F32 var_Min = ( var_R < ( var_G < var_B ? var_G : var_B ) ? var_R : ( var_G < var_B ? var_G : var_B ) );
+        F32 var_Max = ( var_R > ( var_G > var_B ? var_G : var_B ) ? var_R : ( var_G > var_B ? var_G : var_B ) );
+
+        F32 del_Max = var_Max - var_Min;
+
+        F32 L = ( var_Max + var_Min ) / 2.0f;
+        F32 H = 0.0f;
+        F32 S = 0.0f;
+
+        if ( del_Max == 0.0f )
+        {
+           H = 0.0f;
+           S = 0.0f;
+        }
+        else
+        {
+                if ( L < 0.5 )
+                        S = del_Max / ( var_Max + var_Min );
+                else
+                        S = del_Max / ( 2.0f - var_Max - var_Min );
+
+                F32 del_R = ( ( ( var_Max - var_R ) / 6.0f ) + ( del_Max / 2.0f ) ) / del_Max;
+                F32 del_G = ( ( ( var_Max - var_G ) / 6.0f ) + ( del_Max / 2.0f ) ) / del_Max;
+                F32 del_B = ( ( ( var_Max - var_B ) / 6.0f ) + ( del_Max / 2.0f ) ) / del_Max;
+
+                if ( var_R >= var_Max )
+                        H = del_B - del_G;
+                else
+                if ( var_G >= var_Max )
+                        H = ( 1.0f / 3.0f ) + del_R - del_B;
+                else
+                if ( var_B >= var_Max )
+                        H = ( 2.0f / 3.0f ) + del_G - del_R;
+
+                if ( H < 0.0f ) H += 1.0f;
+                if ( H > 1.0f ) H -= 1.0f;
+        }
+
+        if (hue) *hue = H;
+        if (saturation) *saturation = S;
+        if (luminance) *luminance = L;
+}
+
 // static
 BOOL LLColor4::parseColor(const char* buf, LLColor4* color)
 {
diff --git a/linden/indra/llmath/v4color.h b/linden/indra/llmath/v4color.h
index d4130d6..d79b6c8 100644
--- a/linden/indra/llmath/v4color.h
+++ b/linden/indra/llmath/v4color.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, 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
@@ -73,6 +74,8 @@ class LLColor4
                         mV[3] = (F32) sd[3].asReal();
                 }
 
+                void calcHSL(F32* hue, F32* saturation, F32* luminance) const;
+
                 const LLColor4& setToBlack();                                           // zero LLColor4 to (0, 0, 0, 1)
                 const LLColor4& setToWhite();                                           // zero LLColor4 to (0, 0, 0, 1)
 
diff --git a/linden/indra/llmath/v4coloru.cpp b/linden/indra/llmath/v4coloru.cpp
index 848a082..90399b5 100644
--- a/linden/indra/llmath/v4coloru.cpp
+++ b/linden/indra/llmath/v4coloru.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, 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
diff --git a/linden/indra/llmath/v4coloru.h b/linden/indra/llmath/v4coloru.h
index a5124d0..08e723a 100644
--- a/linden/indra/llmath/v4coloru.h
+++ b/linden/indra/llmath/v4coloru.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, 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
diff --git a/linden/indra/llmath/v4math.cpp b/linden/indra/llmath/v4math.cpp
index a4af47d..fa52d95 100644
--- a/linden/indra/llmath/v4math.cpp
+++ b/linden/indra/llmath/v4math.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2000-2007, 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
diff --git a/linden/indra/llmath/v4math.h b/linden/indra/llmath/v4math.h
index f768ba7..f3c2ccc 100644
--- a/linden/indra/llmath/v4math.h
+++ b/linden/indra/llmath/v4math.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2000-2007, 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
@@ -45,7 +46,8 @@ class LLVector4
         public:
                 F32 mV[LENGTHOFVECTOR4];
                 LLVector4();                                            // Initializes LLVector4 to (0, 0, 0, 1)
-                explicit LLVector4(const F32 *vec);                     // Initializes LLVector4 to (vec[0]. vec[1], vec[2], 1)
+                explicit LLVector4(const F32 *vec);                     // Initializes LLVector4 to (vec[0]. vec[1], vec[2], vec[3])
+                explicit LLVector4(const F64 *vec);                     // Initialized LLVector4 to ((F32) vec[0], (F32) vec[1], (F32) vec[3], (F32) vec[4]);
                 explicit LLVector4(const LLVector3 &vec);                       // Initializes LLVector4 to (vec, 1)
                 explicit LLVector4(const LLVector3 &vec, F32 w);        // Initializes LLVector4 to (vec, w)
                 LLVector4(F32 x, F32 y, F32 z);         // Initializes LLVector4 to (x. y, z, 1)
@@ -155,6 +157,14 @@ inline LLVector4::LLVector4(const F32 *vec)
         mV[VW] = vec[VW];
 }
 
+inline LLVector4::LLVector4(const F64 *vec)
+{
+        mV[VX] = (F32) vec[VX];
+        mV[VY] = (F32) vec[VY];
+        mV[VZ] = (F32) vec[VZ];
+        mV[VW] = (F32) vec[VW];
+}
+
 inline LLVector4::LLVector4(const LLVector3 &vec)
 {
         mV[VX] = vec.mV[VX];
diff --git a/linden/indra/llmath/xform.cpp b/linden/indra/llmath/xform.cpp
index fc2e060..71c2755 100644
--- a/linden/indra/llmath/xform.cpp
+++ b/linden/indra/llmath/xform.cpp
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2001-2007, 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
diff --git a/linden/indra/llmath/xform.h b/linden/indra/llmath/xform.h
index af28e43..605b1b5 100644
--- a/linden/indra/llmath/xform.h
+++ b/linden/indra/llmath/xform.h
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2001-2007, 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