59 files changed, 352 insertions, 110 deletions

diff --git a/linden/indra/llmath/camera.h b/linden/indra/llmath/camera.h
index be8c711..d41af4b 100644
--- a/linden/indra/llmath/camera.h
+++ b/linden/indra/llmath/camera.h
@@ -2,6 +2,8 @@
  * @file camera.h
  * @brief Legacy wrapper header.
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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$
  */
 
 #include "llcamera.h"
diff --git a/linden/indra/llmath/coordframe.h b/linden/indra/llmath/coordframe.h
index 01d3031..384167a 100644
--- a/linden/indra/llmath/coordframe.h
+++ b/linden/indra/llmath/coordframe.h
@@ -2,6 +2,8 @@
  * @file coordframe.h
  * @brief Legacy wrapper header.
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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$
  */
 
 #include "llcoordframe.h"
diff --git a/linden/indra/llmath/llbboxlocal.cpp b/linden/indra/llmath/llbboxlocal.cpp
index 505c7e6..313013e 100644
--- a/linden/indra/llmath/llbboxlocal.cpp
+++ b/linden/indra/llmath/llbboxlocal.cpp
@@ -2,6 +2,8 @@
  * @file llbboxlocal.cpp
  * @brief General purpose bounding box class (Not axis aligned).
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llmath/llbboxlocal.h b/linden/indra/llmath/llbboxlocal.h
index 4fdc01f..043f2df 100644
--- a/linden/indra/llmath/llbboxlocal.h
+++ b/linden/indra/llmath/llbboxlocal.h
@@ -2,6 +2,8 @@
  * @file llbboxlocal.h
  * @brief General purpose bounding box class.
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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_BBOXLOCAL_H
diff --git a/linden/indra/llmath/llcamera.cpp b/linden/indra/llmath/llcamera.cpp
index c32bb67..2ec9ba8 100644
--- a/linden/indra/llmath/llcamera.cpp
+++ b/linden/indra/llmath/llcamera.cpp
@@ -2,6 +2,8 @@
  * @file llcamera.cpp
  * @brief Implementation of the LLCamera class.
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llmath/llcamera.h b/linden/indra/llmath/llcamera.h
index b5f78f4..67ffb2e 100644
--- a/linden/indra/llmath/llcamera.h
+++ b/linden/indra/llmath/llcamera.h
@@ -2,6 +2,8 @@
  * @file llcamera.h
  * @brief Header file for the LLCamera class.
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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_CAMERA_H
diff --git a/linden/indra/llmath/llcoord.h b/linden/indra/llmath/llcoord.h
index a1ed130..91fd507 100644
--- a/linden/indra/llmath/llcoord.h
+++ b/linden/indra/llmath/llcoord.h
@@ -1,6 +1,8 @@
 /** 
  * @file llcoord.h
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -23,6 +25,7 @@
  * 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_LLCOORD_H
diff --git a/linden/indra/llmath/llcoordframe.cpp b/linden/indra/llmath/llcoordframe.cpp
index 1650dd2..70d4646 100644
--- a/linden/indra/llmath/llcoordframe.cpp
+++ b/linden/indra/llmath/llcoordframe.cpp
@@ -2,6 +2,8 @@
  * @file llcoordframe.cpp
  * @brief LLCoordFrame class implementation.
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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$
  */
 
 #include "linden_common.h"
@@ -60,7 +63,8 @@ LLCoordFrame::LLCoordFrame(const LLVector3 &origin) :
 {
         if( !mOrigin.isFinite() )
         {
-                llerrs << "Non Finite in LLCoordFrame::LLCoordFrame()" << llendl;
+                reset();
+                llwarns << "Non Finite in LLCoordFrame::LLCoordFrame()" << llendl;
         }
 }
 
@@ -71,7 +75,8 @@ LLCoordFrame::LLCoordFrame(const LLVector3 &origin, const LLVector3 &direction)
         
         if( !isFinite() )
         {
-                llerrs << "Non Finite in LLCoordFrame::LLCoordFrame()" << llendl;
+                reset();
+                llwarns << "Non Finite in LLCoordFrame::LLCoordFrame()" << llendl;
         }
 }
 
@@ -85,7 +90,8 @@ LLCoordFrame::LLCoordFrame(const LLVector3 &x_axis,
 {
         if( !isFinite() )
         {
-                llerrs << "Non Finite in LLCoordFrame::LLCoordFrame()" << llendl;
+                reset();
+                llwarns << "Non Finite in LLCoordFrame::LLCoordFrame()" << llendl;
         }
 }
 
@@ -100,7 +106,8 @@ LLCoordFrame::LLCoordFrame(const LLVector3 &origin,
 {
         if( !isFinite() )
         {
-                llerrs << "Non Finite in LLCoordFrame::LLCoordFrame()" << llendl;
+                reset();
+                llwarns << "Non Finite in LLCoordFrame::LLCoordFrame()" << llendl;
         }
 }
 
@@ -114,7 +121,8 @@ LLCoordFrame::LLCoordFrame(const LLVector3 &origin,
 {
         if( !isFinite() )
         {
-                llerrs << "Non Finite in LLCoordFrame::LLCoordFrame()" << llendl;
+                reset();
+                llwarns << "Non Finite in LLCoordFrame::LLCoordFrame()" << llendl;
         }
 }
 
@@ -128,7 +136,8 @@ LLCoordFrame::LLCoordFrame(const LLQuaternion &q) :
 
         if( !isFinite() )
         {
-                llerrs << "Non Finite in LLCoordFrame::LLCoordFrame()" << llendl;
+                reset();
+                llwarns << "Non Finite in LLCoordFrame::LLCoordFrame()" << llendl;
         }
 }
 
@@ -142,7 +151,8 @@ LLCoordFrame::LLCoordFrame(const LLVector3 &origin, const LLQuaternion &q) :
 
         if( !isFinite() )
         {
-                llerrs << "Non Finite in LLCoordFrame::LLCoordFrame()" << llendl;
+                reset();
+                llwarns << "Non Finite in LLCoordFrame::LLCoordFrame()" << llendl;
         }
 }
 
@@ -154,7 +164,8 @@ LLCoordFrame::LLCoordFrame(const LLMatrix4 &mat) :
 {
         if( !isFinite() )
         {
-                llerrs << "Non Finite in LLCoordFrame::LLCoordFrame()" << llendl;
+                reset();
+                llwarns << "Non Finite in LLCoordFrame::LLCoordFrame()" << llendl;
         }
 }
 
@@ -169,7 +180,8 @@ LLCoordFrame::LLCoordFrame(const F32 *origin, const F32 *rotation) :
 {
         if( !isFinite() )
         {
-                llerrs << "Non Finite in LLCoordFrame::LLCoordFrame()" << llendl;
+                reset();
+                llwarns << "Non Finite in LLCoordFrame::LLCoordFrame()" << llendl;
         }
 }
 */
@@ -183,7 +195,8 @@ LLCoordFrame::LLCoordFrame(const F32 *origin_and_rotation) :
 {
         if( !isFinite() )
         {
-                llerrs << "Non Finite in LLCoordFrame::LLCoordFrame()" << llendl;
+                reset();
+                llwarns << "Non Finite in LLCoordFrame::LLCoordFrame()" << llendl;
         }
 }
 */
@@ -211,7 +224,8 @@ void LLCoordFrame::setOrigin(F32 x, F32 y, F32 z)
 
         if( !mOrigin.isFinite() )
         {
-                llerrs << "Non Finite in LLCoordFrame::setOrigin()" << llendl;
+                reset();
+                llwarns << "Non Finite in LLCoordFrame::setOrigin()" << llendl;
         }
 }
 
@@ -220,7 +234,8 @@ void LLCoordFrame::setOrigin(const LLVector3 &new_origin)
         mOrigin = new_origin; 
         if( !mOrigin.isFinite() )
         {
-                llerrs << "Non Finite in LLCoordFrame::setOrigin()" << llendl;
+                reset();
+                llwarns << "Non Finite in LLCoordFrame::setOrigin()" << llendl;
         }
 }
 
@@ -232,7 +247,8 @@ void LLCoordFrame::setOrigin(const F32 *origin)
 
         if( !mOrigin.isFinite() )
         {
-                llerrs << "Non Finite in LLCoordFrame::setOrigin()" << llendl;
+                reset();
+                llwarns << "Non Finite in LLCoordFrame::setOrigin()" << llendl;
         }
 }
 
@@ -242,7 +258,8 @@ void LLCoordFrame::setOrigin(const LLCoordFrame &frame)
 
         if( !mOrigin.isFinite() )
         {
-                llerrs << "Non Finite in LLCoordFrame::setOrigin()" << llendl;
+                reset();
+                llwarns << "Non Finite in LLCoordFrame::setOrigin()" << llendl;
         }
 }
 
@@ -258,7 +275,8 @@ void LLCoordFrame::setAxes(const LLVector3 &x_axis,
         mZAxis = z_axis;
         if( !isFinite() )
         {
-                llerrs << "Non Finite in LLCoordFrame::setAxes()" << llendl;
+                reset();
+                llwarns << "Non Finite in LLCoordFrame::setAxes()" << llendl;
         }
 }
 
@@ -270,7 +288,8 @@ void LLCoordFrame::setAxes(const LLMatrix3 &rotation_matrix)
         mZAxis.setVec(rotation_matrix.mMatrix[VZ]);
         if( !isFinite() )
         {
-                llerrs << "Non Finite in LLCoordFrame::setAxes()" << llendl;
+                reset();
+                llwarns << "Non Finite in LLCoordFrame::setAxes()" << llendl;
         }
 }
 
@@ -281,7 +300,8 @@ void LLCoordFrame::setAxes(const LLQuaternion &q )
         setAxes(rotation_matrix);
         if( !isFinite() )
         {
-                llerrs << "Non Finite in LLCoordFrame::setAxes()" << llendl;
+                reset();
+                llwarns << "Non Finite in LLCoordFrame::setAxes()" << llendl;
         }
 }
 
@@ -300,7 +320,8 @@ void LLCoordFrame::setAxes(  const F32 *rotation_matrix )
 
         if( !isFinite() )
         {
-                llerrs << "Non Finite in LLCoordFrame::setAxes()" << llendl;
+                reset();
+                llwarns << "Non Finite in LLCoordFrame::setAxes()" << llendl;
         }
 }
 
@@ -313,7 +334,8 @@ void LLCoordFrame::setAxes(const LLCoordFrame &frame)
 
         if( !isFinite() )
         {
-                llerrs << "Non Finite in LLCoordFrame::setAxes()" << llendl;
+                reset();
+                llwarns << "Non Finite in LLCoordFrame::setAxes()" << llendl;
         }
 }
 
@@ -328,7 +350,8 @@ void LLCoordFrame::translate(F32 x, F32 y, F32 z)
 
         if( !mOrigin.isFinite() )
         {
-                llerrs << "Non Finite in LLCoordFrame::translate()" << llendl;
+                reset();
+                llwarns << "Non Finite in LLCoordFrame::translate()" << llendl;
         }
 }
 
@@ -339,7 +362,8 @@ void LLCoordFrame::translate(const LLVector3 &v)
 
         if( !mOrigin.isFinite() )
         {
-                llerrs << "Non Finite in LLCoordFrame::translate()" << llendl;
+                reset();
+                llwarns << "Non Finite in LLCoordFrame::translate()" << llendl;
         }
 }
 
@@ -352,7 +376,8 @@ void LLCoordFrame::translate(const F32 *origin)
 
         if( !mOrigin.isFinite() )
         {
-                llerrs << "Non Finite in LLCoordFrame::translate()" << llendl;
+                reset();
+                llwarns << "Non Finite in LLCoordFrame::translate()" << llendl;
         }
 }
 
@@ -388,7 +413,8 @@ void LLCoordFrame::rotate(const LLMatrix3 &rotation_matrix)
 
         if( !isFinite() )
         {
-                llerrs << "Non Finite in LLCoordFrame::rotate()" << llendl;
+                reset();
+                llwarns << "Non Finite in LLCoordFrame::rotate()" << llendl;
         }
 }
 
@@ -401,7 +427,8 @@ void LLCoordFrame::roll(F32 angle)
 
         if( !mYAxis.isFinite() || !mZAxis.isFinite() )
         {
-                llerrs << "Non Finite in LLCoordFrame::roll()" << llendl;
+                reset();
+                llwarns << "Non Finite in LLCoordFrame::roll()" << llendl;
         }
 }
 
@@ -413,7 +440,8 @@ void LLCoordFrame::pitch(F32 angle)
 
         if( !mXAxis.isFinite() || !mZAxis.isFinite() )
         {
-                llerrs << "Non Finite in LLCoordFrame::pitch()" << llendl;
+                reset();
+                llwarns << "Non Finite in LLCoordFrame::pitch()" << llendl;
         }
 }
 
@@ -425,7 +453,8 @@ void LLCoordFrame::yaw(F32 angle)
 
         if( !mXAxis.isFinite() || !mYAxis.isFinite() )
         {
-                llerrs << "Non Finite in LLCoordFrame::yaw()" << llendl;
+                reset();
+                llwarns << "Non Finite in LLCoordFrame::yaw()" << llendl;
         }
 }
 
@@ -484,7 +513,8 @@ size_t LLCoordFrame::readOrientation(const char *buffer)
 
         if( !isFinite() )
         {
-                llerrs << "Non Finite in LLCoordFrame::readOrientation()" << llendl;
+                reset();
+                llwarns << "Non Finite in LLCoordFrame::readOrientation()" << llendl;
         }
 
         return 12*sizeof(F32);
diff --git a/linden/indra/llmath/llcoordframe.h b/linden/indra/llmath/llcoordframe.h
index 2777cbe..95deba6 100644
--- a/linden/indra/llmath/llcoordframe.h
+++ b/linden/indra/llmath/llcoordframe.h
@@ -2,6 +2,8 @@
  * @file llcoordframe.h
  * @brief LLCoordFrame class header file.
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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_COORDFRAME_H
diff --git a/linden/indra/llmath/llcrc.cpp b/linden/indra/llmath/llcrc.cpp
index 5b3ab4b..0836ccb 100644
--- a/linden/indra/llmath/llcrc.cpp
+++ b/linden/indra/llmath/llcrc.cpp
@@ -2,6 +2,8 @@
  * @file llcrc.cpp
  * @brief implementation of the crc class.
  *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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$
  */
 
 #include "linden_common.h"
@@ -31,8 +34,6 @@
 #include "llcrc.h"
 #include "llerror.h"
 
-#include <stdio.h>
-
 /* Copyright (C) 1986 Gary S. Brown.  You may use this program, or
    code or tables extracted from it, as desired without restriction.*/
 
diff --git a/linden/indra/llmath/llcrc.h b/linden/indra/llmath/llcrc.h
index 9f71fcc..287c1fb 100644
--- a/linden/indra/llmath/llcrc.h
+++ b/linden/indra/llmath/llcrc.h
@@ -2,6 +2,8 @@
  * @file llcrc.h
  * @brief LLCRC class header file.
  *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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_LLCRC_H
diff --git a/linden/indra/llmath/llinterp.h b/linden/indra/llmath/llinterp.h
index 724fb31..0ad9113 100644
--- a/linden/indra/llmath/llinterp.h
+++ b/linden/indra/llmath/llinterp.h
@@ -1,6 +1,8 @@
 /** 
  * @file llinterp.h
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -23,6 +25,7 @@
  * 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_LLINTERP_H
diff --git a/linden/indra/llmath/llmath.h b/linden/indra/llmath/llmath.h
index 9be2524..f1b223f 100644
--- a/linden/indra/llmath/llmath.h
+++ b/linden/indra/llmath/llmath.h
@@ -2,6 +2,8 @@
  * @file llmath.h
  * @brief Useful math constants and macros.
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,17 +26,12 @@
  * 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 LLMATH_H
 #define LLMATH_H
 
-#include <cmath>
-#include <math.h>
-#include <stdlib.h>
-
-#include "lldefs.h"
-
 // work around for Windows & older gcc non-standard function names.
 #if LL_WINDOWS
 #define llisnan(val)    _isnan(val)
diff --git a/linden/indra/llmath/llmd5.cpp b/linden/indra/llmath/llmd5.cpp
index 1a8630c..033eb2f 100644
--- a/linden/indra/llmath/llmd5.cpp
+++ b/linden/indra/llmath/llmd5.cpp
@@ -1,6 +1,8 @@
 /** 
  * @file llmd5.cpp
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -23,6 +25,7 @@
  * 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$
  */
 
 // llMD5.CC - source code for the C++/object oriented translation and 
@@ -78,10 +81,7 @@ documentation and/or software.
 
 #include "llmd5.h"
 
-#include <assert.h>
-#include <string.h>
-#include <fstream>
-#include <iostream>
+#include <cassert>
 
 // how many bytes to grab at a time when checking files
 const int LLMD5::BLOCK_LEN = 4096;
diff --git a/linden/indra/llmath/llmd5.h b/linden/indra/llmath/llmd5.h
index 5df98bf..7dabbfe 100644
--- a/linden/indra/llmath/llmd5.h
+++ b/linden/indra/llmath/llmd5.h
@@ -1,6 +1,8 @@
 /** 
  * @file llmd5.h
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -23,6 +25,7 @@
  * 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_LLMD5_H
@@ -69,9 +72,6 @@ documentation and/or software.
 
 */
 
-#include <stdio.h>
-#include <iosfwd>
-
 // use for the raw digest output
 const int MD5RAW_BYTES = 16;
 
diff --git a/linden/indra/llmath/lloctree.h b/linden/indra/llmath/lloctree.h
index 2395f0f..def6cb4 100644
--- a/linden/indra/llmath/lloctree.h
+++ b/linden/indra/llmath/lloctree.h
@@ -2,6 +2,8 @@
  * @file lloctree.h
  * @brief Octree declaration. 
  *
+ * $LicenseInfo:firstyear=2005&license=viewergpl$
+ * 
  * Copyright (c) 2005-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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_LLOCTREE_H
diff --git a/linden/indra/llmath/llperlin.cpp b/linden/indra/llmath/llperlin.cpp
index 38b4d0d..4dcc7ab 100644
--- a/linden/indra/llmath/llperlin.cpp
+++ b/linden/indra/llmath/llperlin.cpp
@@ -1,6 +1,8 @@
 /** 
  * @file llperlin.cpp
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -23,6 +25,7 @@
  * 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$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llmath/llperlin.h b/linden/indra/llmath/llperlin.h
index e5fc4b0..63daaa6 100644
--- a/linden/indra/llmath/llperlin.h
+++ b/linden/indra/llmath/llperlin.h
@@ -1,6 +1,8 @@
 /** 
  * @file llperlin.h
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -23,6 +25,7 @@
  * 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_PERLIN_H
diff --git a/linden/indra/llmath/llplane.h b/linden/indra/llmath/llplane.h
index 0e0e17d..c1fb7d8 100644
--- a/linden/indra/llmath/llplane.h
+++ b/linden/indra/llmath/llplane.h
@@ -1,6 +1,8 @@
 /** 
  * @file llplane.h
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -23,6 +25,7 @@
  * 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_LLPLANE_H
diff --git a/linden/indra/llmath/llquantize.h b/linden/indra/llmath/llquantize.h
index a4fd67a..817c4c3 100644
--- a/linden/indra/llmath/llquantize.h
+++ b/linden/indra/llmath/llquantize.h
@@ -3,6 +3,8 @@
  * @brief useful routines for quantizing floats to various length ints
  * and back out again
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -25,6 +27,7 @@
  * 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_LLQUANTIZE_H
@@ -40,6 +43,18 @@ const U8 FIRSTVALIDCHAR = 54;
 const U8 MAXSTRINGVAL = U8MAX - FIRSTVALIDCHAR; //we don't allow newline or null 
 
 
+inline U16 F32_to_U16_ROUND(F32 val, F32 lower, F32 upper)
+{
+        val = llclamp(val, lower, upper);
+        // make sure that the value is positive and normalized to <0, 1>
+        val -= lower;
+        val /= (upper - lower);
+
+        // round the value.   Sreturn the U16
+        return (U16)(llround(val*U16MAX));
+}
+
+
 inline U16 F32_to_U16(F32 val, F32 lower, F32 upper)
 {
         val = llclamp(val, lower, upper);
@@ -67,6 +82,19 @@ inline F32 U16_to_F32(U16 ival, F32 lower, F32 upper)
         return val;
 }
 
+
+inline U8 F32_to_U8_ROUND(F32 val, F32 lower, F32 upper)
+{
+        val = llclamp(val, lower, upper);
+        // make sure that the value is positive and normalized to <0, 1>
+        val -= lower;
+        val /= (upper - lower);
+
+        // return the rounded U8
+        return (U8)(llround(val*U8MAX));
+}
+
+
 inline U8 F32_to_U8(F32 val, F32 lower, F32 upper)
 {
         val = llclamp(val, lower, upper);
diff --git a/linden/indra/llmath/llquaternion.cpp b/linden/indra/llmath/llquaternion.cpp
index 06e34af..34c1fd1 100644
--- a/linden/indra/llmath/llquaternion.cpp
+++ b/linden/indra/llmath/llquaternion.cpp
@@ -2,6 +2,8 @@
  * @file llquaternion.cpp
  * @brief LLQuaternion class implementation.
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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$
  */
 
 #include "linden_common.h"
@@ -107,23 +110,27 @@ void	LLQuaternion::quantize16(F32 lower, F32 upper)
         F32 z = mQ[VZ];
         F32 s = mQ[VS];
 
-        x = U16_to_F32(F32_to_U16(x, lower, upper), lower, upper);
-        y = U16_to_F32(F32_to_U16(y, lower, upper), lower, upper);
-        z = U16_to_F32(F32_to_U16(z, lower, upper), lower, upper);
-        s = U16_to_F32(F32_to_U16(s, lower, upper), lower, upper);
+        x = U16_to_F32(F32_to_U16_ROUND(x, lower, upper), lower, upper);
+        y = U16_to_F32(F32_to_U16_ROUND(y, lower, upper), lower, upper);
+        z = U16_to_F32(F32_to_U16_ROUND(z, lower, upper), lower, upper);
+        s = U16_to_F32(F32_to_U16_ROUND(s, lower, upper), lower, upper);
 
         mQ[VX] = x;
         mQ[VY] = y;
         mQ[VZ] = z;
         mQ[VS] = s;
+
+        normQuat();
 }
 
 void    LLQuaternion::quantize8(F32 lower, F32 upper)
 {
-        mQ[VX] = U8_to_F32(F32_to_U8(mQ[VX], lower, upper), lower, upper);
-        mQ[VY] = U8_to_F32(F32_to_U8(mQ[VY], lower, upper), lower, upper);
-        mQ[VZ] = U8_to_F32(F32_to_U8(mQ[VZ], lower, upper), lower, upper);
-        mQ[VS] = U8_to_F32(F32_to_U8(mQ[VS], lower, upper), lower, upper);
+        mQ[VX] = U8_to_F32(F32_to_U8_ROUND(mQ[VX], lower, upper), lower, upper);
+        mQ[VY] = U8_to_F32(F32_to_U8_ROUND(mQ[VY], lower, upper), lower, upper);
+        mQ[VZ] = U8_to_F32(F32_to_U8_ROUND(mQ[VZ], lower, upper), lower, upper);
+        mQ[VS] = U8_to_F32(F32_to_U8_ROUND(mQ[VS], lower, upper), lower, upper);
+
+        normQuat();
 }
 
 // LLVector3 Magnitude and Normalization Functions
diff --git a/linden/indra/llmath/llquaternion.h b/linden/indra/llmath/llquaternion.h
index 66a8b40..01ddae9 100644
--- a/linden/indra/llmath/llquaternion.h
+++ b/linden/indra/llmath/llquaternion.h
@@ -2,6 +2,8 @@
  * @file llquaternion.h
  * @brief LLQuaternion class header file.
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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 LLQUATERNION_H
diff --git a/linden/indra/llmath/llrand.cpp b/linden/indra/llmath/llrand.cpp
index e6c4cc5..11ecd8e 100644
--- a/linden/indra/llmath/llrand.cpp
+++ b/linden/indra/llmath/llrand.cpp
@@ -2,6 +2,8 @@
  * @file llrand.cpp
  * @brief Global random generator.
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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$
  */
 
 #include "linden_common.h"
@@ -64,7 +67,7 @@
 #define LL_USE_SYSTEM_RAND 0
 
 #if LL_USE_SYSTEM_RAND
-#include <stdlib.h>
+#include <cstdlib>
 #endif
 
 #if LL_USE_SYSTEM_RAND
diff --git a/linden/indra/llmath/llrand.h b/linden/indra/llmath/llrand.h
index c5ab7e3..5bd874b 100644
--- a/linden/indra/llmath/llrand.h
+++ b/linden/indra/llmath/llrand.h
@@ -2,6 +2,8 @@
  * @file llrand.h
  * @brief Information, functions, and typedefs for randomness.
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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_LLRAND_H
diff --git a/linden/indra/llmath/llrect.cpp b/linden/indra/llmath/llrect.cpp
index d9efe45..f7825fa 100644
--- a/linden/indra/llmath/llrect.cpp
+++ b/linden/indra/llmath/llrect.cpp
@@ -1,6 +1,8 @@
 /** 
  * @file llrect.cpp
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -23,6 +25,7 @@
  * 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$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llmath/llrect.h b/linden/indra/llmath/llrect.h
index 38a4983..00a1b03 100644
--- a/linden/indra/llmath/llrect.h
+++ b/linden/indra/llmath/llrect.h
@@ -2,6 +2,8 @@
  * @file llrect.h
  * @brief A rectangle in GL coordinates, with bottom,left = 0,0
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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$
  */
 
 
diff --git a/linden/indra/llmath/lltreenode.h b/linden/indra/llmath/lltreenode.h
index 8a8710f..6cafee0 100644
--- a/linden/indra/llmath/lltreenode.h
+++ b/linden/indra/llmath/lltreenode.h
@@ -1,6 +1,8 @@
 /** 
  * @file lltreenode.h
  *
+ * $LicenseInfo:firstyear=2005&license=viewergpl$
+ * 
  * Copyright (c) 2005-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -23,6 +25,7 @@
  * 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_LLTREENODE_H
diff --git a/linden/indra/llmath/lluuid.cpp b/linden/indra/llmath/lluuid.cpp
index 97d8c1c..1a7f90f 100644
--- a/linden/indra/llmath/lluuid.cpp
+++ b/linden/indra/llmath/lluuid.cpp
@@ -1,6 +1,8 @@
 /** 
  * @file lluuid.cpp
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -23,6 +25,7 @@
  * 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$
  */
 
 #include "linden_common.h"
@@ -34,7 +37,6 @@
 #       include <windows.h>
 #endif
 
-#include "stdtypes.h"
 #include "lldefs.h"
 #include "llerror.h"
 
@@ -516,8 +518,6 @@ S32 LLUUID::getNodeID(unsigned char * node_id)
 /*
  * Get an ethernet hardware address, if we can find it...
  */
-#include <stdio.h>
-#include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/time.h>
@@ -598,11 +598,8 @@ S32 LLUUID::getNodeID(unsigned char *node_id)
  * Get the ethernet hardware address, if we can find it...
  */
 #include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <time.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
diff --git a/linden/indra/llmath/lluuid.h b/linden/indra/llmath/lluuid.h
index 6334ea4..ebe6e2f 100644
--- a/linden/indra/llmath/lluuid.h
+++ b/linden/indra/llmath/lluuid.h
@@ -1,6 +1,8 @@
 /** 
  * @file lluuid.h
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -23,6 +25,7 @@
  * 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_LLUUID_H
diff --git a/linden/indra/llmath/llv4math.h b/linden/indra/llmath/llv4math.h
index 2853ab6..9ad689b 100644
--- a/linden/indra/llmath/llv4math.h
+++ b/linden/indra/llmath/llv4math.h
@@ -2,7 +2,9 @@
  * @file llv4math.h
  * @brief LLV4* class header file - vector processor enabled math
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -24,6 +26,7 @@
  * 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_LLV4MATH_H
diff --git a/linden/indra/llmath/llv4matrix3.h b/linden/indra/llmath/llv4matrix3.h
index 0811338..bed09d0 100644
--- a/linden/indra/llmath/llv4matrix3.h
+++ b/linden/indra/llmath/llv4matrix3.h
@@ -2,7 +2,9 @@
  * @file llviewerjointmesh.cpp
  * @brief LLV4* class header file - vector processor enabled math
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -24,6 +26,7 @@
  * 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_LLV4MATRIX3_H
diff --git a/linden/indra/llmath/llv4matrix4.h b/linden/indra/llmath/llv4matrix4.h
index 38280a2..8ffb9d3 100644
--- a/linden/indra/llmath/llv4matrix4.h
+++ b/linden/indra/llmath/llv4matrix4.h
@@ -2,7 +2,9 @@
  * @file llviewerjointmesh.cpp
  * @brief LLV4* class header file - vector processor enabled math
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -24,6 +26,7 @@
  * 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_LLV4MATRIX4_H
diff --git a/linden/indra/llmath/llv4vector3.h b/linden/indra/llmath/llv4vector3.h
index 994e7f5..e176908 100644
--- a/linden/indra/llmath/llv4vector3.h
+++ b/linden/indra/llmath/llv4vector3.h
@@ -2,7 +2,9 @@
  * @file llviewerjointmesh.cpp
  * @brief LLV4* class header file - vector processor enabled math
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -24,6 +26,7 @@
  * 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_LLV4VECTOR3_H
diff --git a/linden/indra/llmath/llvolume.cpp b/linden/indra/llmath/llvolume.cpp
index 7f2a663..9cad612 100644
--- a/linden/indra/llmath/llvolume.cpp
+++ b/linden/indra/llmath/llvolume.cpp
@@ -1,6 +1,8 @@
 /** 
  * @file llvolume.cpp
  *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -23,6 +25,7 @@
  * 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$
  */
 
 #include "linden_common.h"
@@ -83,6 +86,8 @@ const S32 SCULPT_REZ_2 = 8;
 const S32 SCULPT_REZ_3 = 16;
 const S32 SCULPT_REZ_4 = 32;
 
+const F32 SCULPT_MIN_AREA = 0.005f;
+
 BOOL check_same_clock_dir( const LLVector3& pt1, const LLVector3& pt2, const LLVector3& pt3, const LLVector3& norm)
 {    
         LLVector3 test = (pt2-pt1)%(pt3-pt2);
@@ -1825,6 +1830,18 @@ void LLVolume::createVolumeFaces()
 }
 
 
+inline LLVector3 sculpt_rgb_to_vector(U8 r, U8 g, U8 b)
+{
+        // maps RGB values to vector values [0..255] -> [-0.5..0.5]
+        LLVector3 value;
+        value.mV[VX] = r / 256.f - 0.5f;
+        value.mV[VY] = g / 256.f - 0.5f;
+        value.mV[VZ] = b / 256.f - 0.5f;
+
+        return value;
+}
+
+
 // sculpt replaces generate() for sculpted surfaces
 void LLVolume::sculpt(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components, const U8* sculpt_data, S32 sculpt_level)
 {
@@ -1849,40 +1866,39 @@ void LLVolume::sculpt(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components,
         mMesh.resize(sizeS * sizeT);
         sNumMeshPoints += mMesh.size();
 
-        S32 vertex_change = 0;
+        F32 area = 0;
         // first test to see if image has enough variation to create non-degenerate geometry
         if (!data_is_empty)
         {
-                S32 last_index = 0;
-                for (S32 s = 0; s < sizeS; s++)
-                        for (S32 t = 0; t < sizeT; t++)
+                for (S32 s = 0; s < sizeS - 1; s++)
+                        for (S32 t = 0; t < sizeT - 1; t++)
                         {
-                                U32 x = (U32) ((F32)s/(sizeS-1) * (F32) sculpt_width);
-                                U32 y = (U32) ((F32)t/(sizeT-1) * (F32) sculpt_height);
+                                // first coordinate
+                                U32 x = (U32) ((F32)s/(sizeS) * (F32) sculpt_width);
+                                U32 y = (U32) ((F32)t/(sizeT) * (F32) sculpt_height);
 
-                                if (y == sculpt_height)  // stitch bottom
-                                {
-                                        y = sculpt_height - 1;
-                                        x = sculpt_width / 2;
-                                }
-
-                                if (x == sculpt_width)   // stitch sides
-                                        x = 0;
-
-                                if (y == 0)  // stitch top
-                                        x = sculpt_width / 2;
-
-                                U32 index = (x + y * sculpt_width) * sculpt_components;
-
-                                if (fabs((F32)(sculpt_data[index] - sculpt_data[last_index])) +
-                                        fabs((F32)(sculpt_data[index+1] - sculpt_data[last_index+1])) +
-                                        fabs((F32)(sculpt_data[index+2] - sculpt_data[last_index+2])) > 0)
-                                        vertex_change++;
-
-                                last_index = index;
+                                // coordinate offset by 1
+                                U32 x2 = (U32) ((F32)(s+1)/(sizeS) * (F32) sculpt_width);
+                                U32 y2 = (U32) ((F32)(t+1)/(sizeT) * (F32) sculpt_height);
+                                        
+                                // three points on a triagle - find the image indices first
+                                U32 p1_index = (x + y * sculpt_width) * sculpt_components;
+                                U32 p2_index = (x2 + y * sculpt_width) * sculpt_components;
+                                U32 p3_index = (x + y2 * sculpt_width) * sculpt_components;
+
+                                // convert image data to vectors
+                                LLVector3 p1 = sculpt_rgb_to_vector(sculpt_data[p1_index], sculpt_data[p1_index+1], sculpt_data[p1_index+2]);
+                                LLVector3 p2 = sculpt_rgb_to_vector(sculpt_data[p2_index], sculpt_data[p2_index+1], sculpt_data[p2_index+2]);
+                                LLVector3 p3 = sculpt_rgb_to_vector(sculpt_data[p3_index], sculpt_data[p3_index+1], sculpt_data[p3_index+2]);
+
+                                // compute the area of the parallelogram by taking the length of the cross product:
+                                // (parallegram is an approximation of two triangles)
+                                LLVector3 cross = (p1 - p2) % (p1 - p3);
+                                // take length squared for efficiency (no sqrt)
+                                area += cross.magVecSquared();
                         }
                 
-                if ((F32)vertex_change / sizeS / sizeT < 0.02) // less than 2%
+                if (area < SCULPT_MIN_AREA * SCULPT_MIN_AREA)
                         data_is_empty = TRUE;
         }
 
@@ -1974,9 +1990,7 @@ void LLVolume::sculpt(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components,
 
                                 
                                 U32 index = (x + y * sculpt_width) * sculpt_components;
-                                pt.mPos.mV[0] = sculpt_data[index  ] / 256.f - 0.5f;
-                                pt.mPos.mV[1] = sculpt_data[index+1] / 256.f - 0.5f;
-                                pt.mPos.mV[2] = sculpt_data[index+2] / 256.f - 0.5f;
+                                pt.mPos = sculpt_rgb_to_vector(sculpt_data[index], sculpt_data[index+1], sculpt_data[index+2]);
                         }
                         line += sizeT;
                 }
diff --git a/linden/indra/llmath/llvolume.h b/linden/indra/llmath/llvolume.h
index ee28057..3dadc56 100644
--- a/linden/indra/llmath/llvolume.h
+++ b/linden/indra/llmath/llvolume.h
@@ -2,6 +2,8 @@
  * @file llvolume.h
  * @brief LLVolume base class.
  *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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_LLVOLUME_H
diff --git a/linden/indra/llmath/llvolumemgr.cpp b/linden/indra/llmath/llvolumemgr.cpp
index eac407f..eae6ab7 100644
--- a/linden/indra/llmath/llvolumemgr.cpp
+++ b/linden/indra/llmath/llvolumemgr.cpp
@@ -1,6 +1,8 @@
 /** 
  * @file llvolumemgr.cpp
  *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -23,6 +25,7 @@
  * 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$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llmath/llvolumemgr.h b/linden/indra/llmath/llvolumemgr.h
index aa00c4e..7aa0a3f 100644
--- a/linden/indra/llmath/llvolumemgr.h
+++ b/linden/indra/llmath/llvolumemgr.h
@@ -2,6 +2,8 @@
  * @file llvolumemgr.h
  * @brief LLVolumeMgr class.
  *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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_LLVOLUMEMGR_H
diff --git a/linden/indra/llmath/m3math.cpp b/linden/indra/llmath/m3math.cpp
index 09a18d2..d4f99cb 100644
--- a/linden/indra/llmath/m3math.cpp
+++ b/linden/indra/llmath/m3math.cpp
@@ -2,6 +2,8 @@
  * @file m3math.cpp
  * @brief LLMatrix3 class implementation.
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llmath/m3math.h b/linden/indra/llmath/m3math.h
index 94c9b65..d2848aa 100644
--- a/linden/indra/llmath/m3math.h
+++ b/linden/indra/llmath/m3math.h
@@ -2,6 +2,8 @@
  * @file m3math.h
  * @brief LLMatrix3 class header file.
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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_M3MATH_H
diff --git a/linden/indra/llmath/m4math.cpp b/linden/indra/llmath/m4math.cpp
index b6d91a1..4e7cf84 100644
--- a/linden/indra/llmath/m4math.cpp
+++ b/linden/indra/llmath/m4math.cpp
@@ -2,6 +2,8 @@
  * @file m4math.cpp
  * @brief LLMatrix4 class implementation.
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llmath/m4math.h b/linden/indra/llmath/m4math.h
index 24f9f86..4958777 100644
--- a/linden/indra/llmath/m4math.h
+++ b/linden/indra/llmath/m4math.h
@@ -2,6 +2,8 @@
  * @file m4math.h
  * @brief LLMatrix3 class header file.
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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_M4MATH_H
diff --git a/linden/indra/llmath/raytrace.cpp b/linden/indra/llmath/raytrace.cpp
index 634542d..fbdc6cf 100644
--- a/linden/indra/llmath/raytrace.cpp
+++ b/linden/indra/llmath/raytrace.cpp
@@ -2,6 +2,8 @@
  * @file raytrace.cpp
  * @brief Functions called by box object scripts.
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llmath/raytrace.h b/linden/indra/llmath/raytrace.h
index f68002f..0735b87 100644
--- a/linden/indra/llmath/raytrace.h
+++ b/linden/indra/llmath/raytrace.h
@@ -2,6 +2,8 @@
  * @file raytrace.h
  * @brief Ray intersection tests for primitives.
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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_RAYTRACE_H
diff --git a/linden/indra/llmath/v2math.cpp b/linden/indra/llmath/v2math.cpp
index e41227b..7033048 100644
--- a/linden/indra/llmath/v2math.cpp
+++ b/linden/indra/llmath/v2math.cpp
@@ -2,6 +2,8 @@
  * @file v2math.cpp
  * @brief LLVector2 class implementation.
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llmath/v2math.h b/linden/indra/llmath/v2math.h
index bcfe016..f2450b1 100644
--- a/linden/indra/llmath/v2math.h
+++ b/linden/indra/llmath/v2math.h
@@ -2,6 +2,8 @@
  * @file v2math.h
  * @brief LLVector2 class header file.
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,13 +26,12 @@
  * 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_V2MATH_H
 #define LL_V2MATH_H
 
-#include <math.h>
-
 #include "llmath.h"
 
 class LLVector4;
diff --git a/linden/indra/llmath/v3color.cpp b/linden/indra/llmath/v3color.cpp
index 5378bc5..462075c 100644
--- a/linden/indra/llmath/v3color.cpp
+++ b/linden/indra/llmath/v3color.cpp
@@ -2,6 +2,8 @@
  * @file v3color.cpp
  * @brief LLColor3 class implementation.
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llmath/v3color.h b/linden/indra/llmath/v3color.h
index 8f9224d..b80fa06 100644
--- a/linden/indra/llmath/v3color.h
+++ b/linden/indra/llmath/v3color.h
@@ -2,6 +2,8 @@
  * @file v3color.h
  * @brief LLColor3 class header file.
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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_V3COLOR_H
diff --git a/linden/indra/llmath/v3dmath.cpp b/linden/indra/llmath/v3dmath.cpp
index 059f9c6..efe1274 100644
--- a/linden/indra/llmath/v3dmath.cpp
+++ b/linden/indra/llmath/v3dmath.cpp
@@ -2,6 +2,8 @@
  * @file v3dmath.cpp
  * @brief LLVector3d class implementation.
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llmath/v3dmath.h b/linden/indra/llmath/v3dmath.h
index c101cc8..ac3f06c 100644
--- a/linden/indra/llmath/v3dmath.h
+++ b/linden/indra/llmath/v3dmath.h
@@ -2,6 +2,8 @@
  * @file v3dmath.h
  * @brief High precision 3 dimensional vector.
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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_V3DMATH_H
diff --git a/linden/indra/llmath/v3math.cpp b/linden/indra/llmath/v3math.cpp
index f42fe1c..5ffd1dd 100644
--- a/linden/indra/llmath/v3math.cpp
+++ b/linden/indra/llmath/v3math.cpp
@@ -2,6 +2,8 @@
  * @file v3math.cpp
  * @brief LLVector3 class implementation.
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llmath/v3math.h b/linden/indra/llmath/v3math.h
index bf211e2..e18b20d 100644
--- a/linden/indra/llmath/v3math.h
+++ b/linden/indra/llmath/v3math.h
@@ -2,6 +2,8 @@
  * @file v3math.h
  * @brief LLVector3 class header file.
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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_V3MATH_H
diff --git a/linden/indra/llmath/v4color.cpp b/linden/indra/llmath/v4color.cpp
index 281e5f1..4ce8e10 100644
--- a/linden/indra/llmath/v4color.cpp
+++ b/linden/indra/llmath/v4color.cpp
@@ -2,6 +2,8 @@
  * @file v4color.cpp
  * @brief LLColor4 class implementation.
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llmath/v4color.h b/linden/indra/llmath/v4color.h
index 2e9d13f..1e6232f 100644
--- a/linden/indra/llmath/v4color.h
+++ b/linden/indra/llmath/v4color.h
@@ -2,6 +2,8 @@
  * @file v4color.h
  * @brief LLColor4 class header file.
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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_V4COLOR_H
diff --git a/linden/indra/llmath/v4coloru.cpp b/linden/indra/llmath/v4coloru.cpp
index 90399b5..6f6900b 100644
--- a/linden/indra/llmath/v4coloru.cpp
+++ b/linden/indra/llmath/v4coloru.cpp
@@ -2,6 +2,8 @@
  * @file v4coloru.cpp
  * @brief LLColor4U class implementation.
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llmath/v4coloru.h b/linden/indra/llmath/v4coloru.h
index 08e723a..fc7845a 100644
--- a/linden/indra/llmath/v4coloru.h
+++ b/linden/indra/llmath/v4coloru.h
@@ -2,6 +2,8 @@
  * @file v4coloru.h
  * @brief The LLColor4U class.
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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_V4COLORU_H
diff --git a/linden/indra/llmath/v4math.cpp b/linden/indra/llmath/v4math.cpp
index fa52d95..b753778 100644
--- a/linden/indra/llmath/v4math.cpp
+++ b/linden/indra/llmath/v4math.cpp
@@ -2,6 +2,8 @@
  * @file v4math.cpp
  * @brief LLVector4 class implementation.
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llmath/v4math.h b/linden/indra/llmath/v4math.h
index f3c2ccc..57dcad3 100644
--- a/linden/indra/llmath/v4math.h
+++ b/linden/indra/llmath/v4math.h
@@ -2,6 +2,8 @@
  * @file v4math.h
  * @brief LLVector4 class header file.
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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_V4MATH_H
diff --git a/linden/indra/llmath/xform.cpp b/linden/indra/llmath/xform.cpp
index 71c2755..8399dfb 100644
--- a/linden/indra/llmath/xform.cpp
+++ b/linden/indra/llmath/xform.cpp
@@ -1,6 +1,8 @@
 /** 
  * @file xform.cpp
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -23,6 +25,7 @@
  * 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$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llmath/xform.h b/linden/indra/llmath/xform.h
index 605b1b5..9a5c991 100644
--- a/linden/indra/llmath/xform.h
+++ b/linden/indra/llmath/xform.h
@@ -1,6 +1,8 @@
 /** 
  * @file xform.h
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -23,6 +25,7 @@
  * 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_XFORM_H
@@ -32,9 +35,6 @@
 #include "m4math.h"
 #include "llquaternion.h"
 
-#define CHECK_FOR_FINITE
-
-
 const F32 MAX_OBJECT_Z          = 768.f;
 const F32 MIN_OBJECT_Z          = -256.f;
 const F32 MIN_OBJECT_SCALE      = 0.01f;
@@ -180,14 +180,16 @@ BOOL LLXform::setParent(LLXform* parent)
         return TRUE;
 }
 
-#ifdef CHECK_FOR_FINITE
 void LLXform::setPosition(const LLVector3& pos)                 
 {
         setChanged(TRANSLATED);
         if (pos.isFinite())
                 mPosition = pos; 
         else
-                llerror("Non Finite in LLXform::setPosition(LLVector3)", 0);
+        {
+                mPosition.clearVec();
+                llwarns << "Non Finite in LLXform::setPosition(LLVector3)" << llendl;
+        }
 }
 
 void LLXform::setPosition(const F32 x, const F32 y, const F32 z)
@@ -196,7 +198,10 @@ void LLXform::setPosition(const F32 x, const F32 y, const F32 z)
         if (llfinite(x) && llfinite(y) && llfinite(z))
                 mPosition.setVec(x,y,z); 
         else
-                llerror("Non Finite in LLXform::setPosition(F32,F32,F32)", 0);
+        {
+                mPosition.clearVec();
+                llwarns << "Non Finite in LLXform::setPosition(F32,F32,F32)" << llendl;
+        }
 }
 
 void LLXform::setPositionX(const F32 x)
@@ -205,7 +210,10 @@ void LLXform::setPositionX(const F32 x)
         if (llfinite(x))
                 mPosition.mV[VX] = x; 
         else
-                llerror("Non Finite in LLXform::setPositionX", 0);
+        {
+                mPosition.mV[VX] = 0.f;
+                llwarns << "Non Finite in LLXform::setPositionX" << llendl;
+        }
 }
 
 void LLXform::setPositionY(const F32 y)
@@ -214,7 +222,10 @@ void LLXform::setPositionY(const F32 y)
         if (llfinite(y))
                 mPosition.mV[VY] = y; 
         else
-                llerror("Non Finite in LLXform::setPositionY", 0);
+        {
+                mPosition.mV[VY] = 0.f;
+                llwarns << "Non Finite in LLXform::setPositionY" << llendl;
+        }
 }
 
 void LLXform::setPositionZ(const F32 z)
@@ -223,7 +234,10 @@ void LLXform::setPositionZ(const F32 z)
         if (llfinite(z))
                 mPosition.mV[VZ] = z; 
         else
-                llerror("Non Finite in LLXform::setPositionZ", 0);
+        {
+                mPosition.mV[VZ] = 0.f;
+                llwarns << "Non Finite in LLXform::setPositionZ" << llendl;
+        }
 }
 
 void LLXform::addPosition(const LLVector3& pos)
@@ -232,7 +246,7 @@ void LLXform::addPosition(const LLVector3& pos)
         if (pos.isFinite())
                 mPosition += pos; 
         else
-                llerror("Non Finite in LLXform::addPosition", 0);
+                llwarns << "Non Finite in LLXform::addPosition" << llendl;
 }
 
 void LLXform::setScale(const LLVector3& scale)
@@ -241,7 +255,10 @@ void LLXform::setScale(const LLVector3& scale)
         if (scale.isFinite())
                 mScale = scale; 
         else
-                llerror("Non Finite in LLXform::setScale", 0);
+        {
+                mScale.setVec(1.f, 1.f, 1.f);
+                llwarns << "Non Finite in LLXform::setScale" << llendl;
+        }
 }
 void LLXform::setScale(const F32 x, const F32 y, const F32 z)
 { 
@@ -249,7 +266,10 @@ void LLXform::setScale(const F32 x, const F32 y, const F32 z)
         if (llfinite(x) && llfinite(y) && llfinite(z))
                 mScale.setVec(x,y,z); 
         else
-                llerror("Non Finite in LLXform::setScale", 0);
+        {
+                mScale.setVec(1.f, 1.f, 1.f);
+                llwarns << "Non Finite in LLXform::setScale" << llendl;
+        }
 }
 void LLXform::setRotation(const LLQuaternion& rot)
 { 
@@ -257,7 +277,10 @@ void LLXform::setRotation(const LLQuaternion& rot)
         if (rot.isFinite())
                 mRotation = rot; 
         else
-                llerror("Non Finite in LLXform::setRotation", 0);
+        {
+                mRotation.loadIdentity();
+                llwarns << "Non Finite in LLXform::setRotation" << llendl;
+        }
 }
 void LLXform::setRotation(const F32 x, const F32 y, const F32 z) 
 { 
@@ -268,7 +291,8 @@ void LLXform::setRotation(const F32 x, const F32 y, const F32 z)
         }
         else
         {
-                llerror("Non Finite in LLXform::setRotation", 0);
+                mRotation.loadIdentity();
+                llwarns << "Non Finite in LLXform::setRotation" << llendl;
         }
 }
 void LLXform::setRotation(const F32 x, const F32 y, const F32 z, const F32 s) 
@@ -280,10 +304,9 @@ void LLXform::setRotation(const F32 x, const F32 y, const F32 z, const F32 s)
         }
         else
         {
-                llerror("Non Finite in LLXform::setRotation", 0);
+                mRotation.loadIdentity();
+                llwarns << "Non Finite in LLXform::setRotation" << llendl;
         }
 }
 
 #endif
-
-#endif