summaryrefslogtreecommitdiff
path: root/indra/llmath/v2math.cpp
diff options
context:
space:
mode:
authorPalmer <palmer@lindenlab.com>2009-11-17 13:40:11 -0800
committerPalmer <palmer@lindenlab.com>2009-11-17 13:40:11 -0800
commit53495d74ee380d492cfed0af91f7660f49619a9f (patch)
tree5992e4769c9acbecc900710048a8eeb4a7806ae4 /indra/llmath/v2math.cpp
parent2365dbcd459b37942ddacbcb7010232113a126c1 (diff)
parentc02702f3871979cb7745b49aa502ac3c71f77681 (diff)
Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/llmath/v2math.cpp')
-rw-r--r--indra/llmath/v2math.cpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/indra/llmath/v2math.cpp b/indra/llmath/v2math.cpp
index 555e1f92bb..220336e0c2 100644
--- a/indra/llmath/v2math.cpp
+++ b/indra/llmath/v2math.cpp
@@ -115,3 +115,18 @@ LLVector2 lerp(const LLVector2 &a, const LLVector2 &b, F32 u)
a.mV[VX] + (b.mV[VX] - a.mV[VX]) * u,
a.mV[VY] + (b.mV[VY] - a.mV[VY]) * u );
}
+
+LLSD LLVector2::getValue() const
+{
+ LLSD ret;
+ ret[0] = mV[0];
+ ret[1] = mV[1];
+ return ret;
+}
+
+void LLVector2::setValue(LLSD& sd)
+{
+ mV[0] = (F32) sd[0].asReal();
+ mV[1] = (F32) sd[1].asReal();
+}
+