From dc48f1c7417f0f49ad1bd32330845ce17a29eece Mon Sep 17 00:00:00 2001 From: Kelly Washington Date: Thu, 3 Apr 2008 22:50:22 +0000 Subject: svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release HAVOK4 IN TEH HOUSE!!11!!ONE!! If it is broken blame Joel for not fixing the loginassetdatabaseinventorygroupIM server instead of working on this. QAR-448 --- indra/llmath/m4math.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/llmath/m4math.h') diff --git a/indra/llmath/m4math.h b/indra/llmath/m4math.h index 4958777b29..7eacbf6542 100644 --- a/indra/llmath/m4math.h +++ b/indra/llmath/m4math.h @@ -132,8 +132,8 @@ public: const LLVector4 &row3); // various useful matrix functions - const LLMatrix4& identity(); // Load identity matrix - const LLMatrix4& zero(); // Clears matrix to all zeros. + const LLMatrix4& setIdentity(); // Load identity matrix + const LLMatrix4& setZero(); // Clears matrix to all zeros. const LLMatrix4& initRotation(const F32 angle, const F32 x, const F32 y, const F32 z); // Calculate rotation matrix by rotating angle radians about (x, y, z) const LLMatrix4& initRotation(const F32 angle, const LLVector4 &axis); // Calculate rotation matrix for rotating angle radians about vec @@ -243,10 +243,10 @@ public: inline LLMatrix4::LLMatrix4() { - identity(); + setIdentity(); } -inline const LLMatrix4& LLMatrix4::identity() +inline const LLMatrix4& LLMatrix4::setIdentity() { mMatrix[0][0] = 1.f; mMatrix[0][1] = 0.f; -- cgit v1.2.3