From 875606a04d656ef6e5600a3a7fb6e8b52feb1945 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Sun, 11 May 2008 20:56:42 +0000
Subject: QAR-566 maint-viewer-5-merge-2 Effective merge: release@84102
 maint-viewer-5@86348 -> maint-viewer-5-merge-2 Actual merge
 maint-viewer-5-merge-2 -r 87239 : 87246 -> release

---
 indra/llmath/m4math.h | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'indra/llmath/m4math.h')

diff --git a/indra/llmath/m4math.h b/indra/llmath/m4math.h
index 7eacbf6542..790e77abc6 100644
--- a/indra/llmath/m4math.h
+++ b/indra/llmath/m4math.h
@@ -1,6 +1,6 @@
 /** 
  * @file m4math.h
- * @brief LLMatrix3 class header file.
+ * @brief LLMatrix4 class header file.
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
@@ -101,9 +101,13 @@ class LLMatrix4
 public:
 	F32	mMatrix[NUM_VALUES_IN_MAT4][NUM_VALUES_IN_MAT4];
 
-	LLMatrix4();										// Initializes Matrix to identity matrix
+	// Initializes Matrix to identity matrix
+	LLMatrix4()
+	{
+		setIdentity();
+	}
 	explicit LLMatrix4(const F32 *mat);								// Initializes Matrix to values in mat
-	explicit LLMatrix4(const LLMatrix3 &mat);						// Initializes Matrix to valuee in mat and sets position to (0,0,0)
+	explicit LLMatrix4(const LLMatrix3 &mat);						// Initializes Matrix to values in mat and sets position to (0,0,0)
 	explicit LLMatrix4(const LLQuaternion &q);						// Initializes Matrix with rotation q and sets position to (0,0,0)
 
 	LLMatrix4(const LLMatrix3 &mat, const LLVector4 &pos);	// Initializes Matrix to values in mat and pos
@@ -240,12 +244,6 @@ public:
 	friend std::ostream&	 operator<<(std::ostream& s, const LLMatrix4 &a);	// Stream a
 };
 
-
-inline LLMatrix4::LLMatrix4()
-{
-	setIdentity();
-}
-
 inline const LLMatrix4&	LLMatrix4::setIdentity()
 {
 	mMatrix[0][0] = 1.f;
-- 
cgit v1.2.3