From 35b4a91129bc3da3476e7f9d8d8eb923a621cc3e Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Tue, 22 Jul 2008 20:55:02 +0000 Subject: 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. --- indra/llmath/v3math.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/llmath/v3math.h') diff --git a/indra/llmath/v3math.h b/indra/llmath/v3math.h index 42ca1f88b2..051d5376b7 100644 --- a/indra/llmath/v3math.h +++ b/indra/llmath/v3math.h @@ -36,7 +36,6 @@ #include "llmath.h" #include "llsd.h" -class LLVector2; class LLVector4; class LLMatrix3; class LLVector3d; @@ -63,7 +62,6 @@ class LLVector3 inline LLVector3(); // Initializes LLVector3 to (0, 0, 0) inline LLVector3(const F32 x, const F32 y, const F32 z); // Initializes LLVector3 to (x. y, z) inline explicit LLVector3(const F32 *vec); // Initializes LLVector3 to (vec[0]. vec[1], vec[2]) - explicit LLVector3(const LLVector2 &vec); // Initializes LLVector3 to (vec[0]. vec[1], 0) explicit LLVector3(const LLVector3d &vec); // Initializes LLVector3 to (vec[0]. vec[1], vec[2]) explicit LLVector3(const LLVector4 &vec); // Initializes LLVector4 to (vec[0]. vec[1], vec[2]) LLVector3(const LLSD& sd); -- cgit v1.2.3