From 52562e2e664c70dcd476291820ac02b893e489b8 Mon Sep 17 00:00:00 2001 From: Karl Steifvater Date: Wed, 23 Jul 2008 21:20:19 +0000 Subject: svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge QAR-698 / DEV-9985 add touch "position" information to touch-events in LSL --- indra/llmath/v3math.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/llmath/v3math.h') diff --git a/indra/llmath/v3math.h b/indra/llmath/v3math.h index 051d5376b7..42ca1f88b2 100644 --- a/indra/llmath/v3math.h +++ b/indra/llmath/v3math.h @@ -36,6 +36,7 @@ #include "llmath.h" #include "llsd.h" +class LLVector2; class LLVector4; class LLMatrix3; class LLVector3d; @@ -62,6 +63,7 @@ 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