From 798d367d54a6c6379ad355bd8345fa40e31e7fe9 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 6 Sep 2008 18:24:57 -0500
Subject: Second Life viewer sources 1.21.0-RC

---
 linden/indra/llmath/v2math.h | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

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

diff --git a/linden/indra/llmath/v2math.h b/linden/indra/llmath/v2math.h
index 5a520d2..350079d 100644
--- a/linden/indra/llmath/v2math.h
+++ b/linden/indra/llmath/v2math.h
@@ -33,6 +33,7 @@
 #define LL_V2MATH_H
 
 #include "llmath.h"
+#include "v3math.h"
 
 class LLVector4;
 class LLMatrix3;
@@ -49,9 +50,10 @@ 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])
+		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])
 		
 		// Clears LLVector2 to (0, 0).  DEPRECATED - prefer zeroVec.
 		void	clear();
@@ -137,6 +139,12 @@ 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.1