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/v3math.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'indra/llmath/v3math.cpp') diff --git a/indra/llmath/v3math.cpp b/indra/llmath/v3math.cpp index 5ffd1dd428..f1fe1a780e 100644 --- a/indra/llmath/v3math.cpp +++ b/indra/llmath/v3math.cpp @@ -172,6 +172,22 @@ LLVector3 LLVector3::scaledVec(const LLVector3& vec) const return ret; } +const LLVector3& LLVector3::set(const LLVector3d &vec) +{ + mV[0] = (F32)vec.mdV[0]; + mV[1] = (F32)vec.mdV[1]; + mV[2] = (F32)vec.mdV[2]; + return (*this); +} + +const LLVector3& LLVector3::set(const LLVector4 &vec) +{ + mV[0] = vec.mV[0]; + mV[1] = vec.mV[1]; + mV[2] = vec.mV[2]; + return (*this); +} + const LLVector3& LLVector3::setVec(const LLVector3d &vec) { mV[0] = (F32)vec.mdV[0]; -- cgit v1.2.3