diff options
author | Rider Linden <rider@lindenlab.com> | 2017-09-19 15:50:30 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2017-09-19 15:50:30 -0700 |
commit | c04ceedbc3e462098eceaa233cd26f6bed79b773 (patch) | |
tree | bd4deb87b3c14ba6413cb30ab40d47aae1517b5a /indra/llmath/v2math.h | |
parent | 2368c44a8e2b031e5a8ac199923a016915cfe96a (diff) |
Baseline for settings changes
Diffstat (limited to 'indra/llmath/v2math.h')
-rw-r--r-- | indra/llmath/v2math.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llmath/v2math.h b/indra/llmath/v2math.h index 8d5db96f5e..2335a2e327 100644 --- a/indra/llmath/v2math.h +++ b/indra/llmath/v2math.h @@ -49,6 +49,7 @@ class LLVector2 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]) + explicit LLVector2(const LLSD &sd); // Clears LLVector2 to (0, 0). DEPRECATED - prefer zeroVec. void clear(); @@ -61,7 +62,7 @@ class LLVector2 void set(const F32 *vec); // Sets LLVector2 to vec LLSD getValue() const; - void setValue(LLSD& sd); + void setValue(const LLSD& sd); void setVec(F32 x, F32 y); // deprecated void setVec(const LLVector2 &vec); // deprecated @@ -145,6 +146,10 @@ inline LLVector2::LLVector2(const LLVector3 &vec) mV[VY] = vec.mV[VY]; } +inline LLVector2::LLVector2(const LLSD &sd) +{ + setValue(sd); +} // Clear and Assignment Functions |