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.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llmath/m4math.cpp') diff --git a/indra/llmath/m4math.cpp b/indra/llmath/m4math.cpp index 4e7cf847dc..836b3178d5 100644 --- a/indra/llmath/m4math.cpp +++ b/indra/llmath/m4math.cpp @@ -163,7 +163,7 @@ LLMatrix4::~LLMatrix4(void) // Clear and Assignment Functions -const LLMatrix4& LLMatrix4::zero() +const LLMatrix4& LLMatrix4::setZero() { mMatrix[0][0] = 0.f; mMatrix[0][1] = 0.f; -- cgit v1.2.3