From 35b4a91129bc3da3476e7f9d8d8eb923a621cc3e Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
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/v2math.h | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'indra/llmath/v2math.h')

diff --git a/indra/llmath/v2math.h b/indra/llmath/v2math.h
index c896b80977..5f46655a07 100644
--- a/indra/llmath/v2math.h
+++ b/indra/llmath/v2math.h
@@ -33,7 +33,6 @@
 #define LL_V2MATH_H
 
 #include "llmath.h"
-#include "v3math.h"
 
 class LLVector4;
 class LLMatrix3;
@@ -50,10 +49,9 @@ class LLVector2
 
 		static LLVector2 zero;
 
-		LLVector2();							  // Initializes LLVector2 to (0, 0)
-		LLVector2(F32 x, F32 y);			      // Initializes LLVector2 to (x. y)
-		LLVector2(const F32 *vec);				  // Initializes LLVector2 to (vec[0]. vec[1])
-        explicit LLVector2(const LLVector3 &vec); // Initializes LLVector2 to (vec[0]. vec[1])
+		LLVector2();							// Initializes LLVector2 to (0, 0)
+		LLVector2(F32 x, F32 y);			    // Initializes LLVector2 to (x. y)
+		LLVector2(const F32 *vec);				// Initializes LLVector2 to (vec[0]. vec[1])
 		
 		// Clears LLVector2 to (0, 0).  DEPRECATED - prefer zeroVec.
 		void	clear();
@@ -139,12 +137,6 @@ inline LLVector2::LLVector2(const F32 *vec)
 	mV[VY] = vec[VY];
 }
 
-inline LLVector2::LLVector2(const LLVector3 &vec)
-{
-	mV[VX] = vec.mV[VX];
-	mV[VY] = vec.mV[VY];
-}
-
 
 // Clear and Assignment Functions
 
-- 
cgit v1.2.3