diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-07-22 20:55:02 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-07-22 20:55:02 +0000 |
| commit | 35b4a91129bc3da3476e7f9d8d8eb923a621cc3e (patch) | |
| tree | 2906124fe8371b6336e6f7231cd890d267a75d6d /indra/llmath/v3math.cpp | |
| parent | df4f20d4f51e41355e876f734527b4245543415c (diff) | |
svn merge -r92710:92709 svn+ssh://svn.lindenlab.com/svn/linden/release --> release
Undo r92710 (for QAR-698) - went straight into release instead of a side branch for validation.
Diffstat (limited to 'indra/llmath/v3math.cpp')
| -rw-r--r-- | indra/llmath/v3math.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/indra/llmath/v3math.cpp b/indra/llmath/v3math.cpp index 12916b6253..166761e550 100644 --- a/indra/llmath/v3math.cpp +++ b/indra/llmath/v3math.cpp @@ -34,7 +34,6 @@ #include "v3math.h" //#include "vmath.h" -#include "v2math.h" #include "v4math.h" #include "m4math.h" #include "m3math.h" @@ -271,13 +270,6 @@ const LLVector3& LLVector3::setVec(const LLVector4 &vec) return (*this); } -LLVector3::LLVector3(const LLVector2 &vec) -{ - mV[VX] = (F32)vec.mV[VX]; - mV[VY] = (F32)vec.mV[VY]; - mV[VZ] = 0; -} - LLVector3::LLVector3(const LLVector3d &vec) { mV[VX] = (F32)vec.mdV[VX]; |