diff options
| author | prep <none@none> | 2012-03-21 09:53:59 -0400 |
|---|---|---|
| committer | prep <none@none> | 2012-03-21 09:53:59 -0400 |
| commit | e94a38f0c99fbbf315c4fba1ce32edbe5f4bf7ed (patch) | |
| tree | 8a547595fcd69d8cfab20bd091922d06536c16d3 /indra/llmath | |
| parent | 154e569923d0caf99fb0d24af8475731f5ceaf33 (diff) | |
| parent | bb0f2d3784e3b14e673c893e95072bca5c54848c (diff) | |
merge
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/llmatrix3a.inl | 1 | ||||
| -rw-r--r-- | indra/llmath/m3math.h | 2 | ||||
| -rw-r--r-- | indra/llmath/v3color.h | 2 | ||||
| -rw-r--r-- | indra/llmath/v3dmath.h | 2 | ||||
| -rw-r--r-- | indra/llmath/v3math.h | 2 | ||||
| -rw-r--r-- | indra/llmath/v4color.h | 2 | ||||
| -rw-r--r-- | indra/llmath/v4math.h | 2 |
7 files changed, 7 insertions, 6 deletions
diff --git a/indra/llmath/llmatrix3a.inl b/indra/llmath/llmatrix3a.inl index 270f1e905b..37819fea3c 100644 --- a/indra/llmath/llmatrix3a.inl +++ b/indra/llmath/llmatrix3a.inl @@ -66,6 +66,7 @@ inline void LLMatrix3a::setTranspose(const LLMatrix3a& src) inline const LLVector4a& LLMatrix3a::getColumn(const U32 column) const { + llassert( column < 3 ); return mColumns[column]; } diff --git a/indra/llmath/m3math.h b/indra/llmath/m3math.h index 3970a5de31..2be5452f8d 100644 --- a/indra/llmath/m3math.h +++ b/indra/llmath/m3math.h @@ -27,7 +27,7 @@ #ifndef LL_M3MATH_H #define LL_M3MATH_H -//#include "llerror.h" +#include "llerror.h" #include "stdtypes.h" class LLVector4; diff --git a/indra/llmath/v3color.h b/indra/llmath/v3color.h index 4e77d9e5ff..56cb2ae73e 100644 --- a/indra/llmath/v3color.h +++ b/indra/llmath/v3color.h @@ -30,7 +30,7 @@ class LLColor4; class LLVector4; -//#include "llerror.h" +#include "llerror.h" #include "llmath.h" #include "llsd.h" diff --git a/indra/llmath/v3dmath.h b/indra/llmath/v3dmath.h index fba549a3b7..578dcdc8ea 100644 --- a/indra/llmath/v3dmath.h +++ b/indra/llmath/v3dmath.h @@ -27,7 +27,7 @@ #ifndef LL_V3DMATH_H #define LL_V3DMATH_H -//#include "llerror.h" +#include "llerror.h" #include "v3math.h" class LLVector3d diff --git a/indra/llmath/v3math.h b/indra/llmath/v3math.h index 206a99b567..0432aeba4c 100644 --- a/indra/llmath/v3math.h +++ b/indra/llmath/v3math.h @@ -27,7 +27,7 @@ #ifndef LL_V3MATH_H #define LL_V3MATH_H -//#include "llerror.h" +#include "llerror.h" #include "llmath.h" #include "llsd.h" diff --git a/indra/llmath/v4color.h b/indra/llmath/v4color.h index 6946b570ab..b047f86e6e 100644 --- a/indra/llmath/v4color.h +++ b/indra/llmath/v4color.h @@ -27,7 +27,7 @@ #ifndef LL_V4COLOR_H #define LL_V4COLOR_H -//#include "llerror.h" +#include "llerror.h" //#include "vmath.h" #include "llmath.h" #include "llsd.h" diff --git a/indra/llmath/v4math.h b/indra/llmath/v4math.h index f999e0533e..623c8b2003 100644 --- a/indra/llmath/v4math.h +++ b/indra/llmath/v4math.h @@ -27,7 +27,7 @@ #ifndef LL_V4MATH_H #define LL_V4MATH_H -//#include "llerror.h" +#include "llerror.h" #include "llmath.h" #include "v3math.h" |