diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llcommon/llsdutil.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/linden/indra/llcommon/llsdutil.h b/linden/indra/llcommon/llsdutil.h index ae6d694..905c031 100644 --- a/linden/indra/llcommon/llsdutil.h +++ b/linden/indra/llcommon/llsdutil.h | |||
@@ -35,35 +35,34 @@ | |||
35 | #define LL_LLSDUTIL_H | 35 | #define LL_LLSDUTIL_H |
36 | 36 | ||
37 | #include "llsd.h" | 37 | #include "llsd.h" |
38 | #include "../llmath/v3math.h" | ||
39 | #include "../llmath/v4math.h" | ||
40 | #include "../llmath/v3dmath.h" | ||
41 | #include "../llmath/v2math.h" | ||
42 | #include "../llmath/llquaternion.h" | ||
43 | #include "../llmath/v4color.h" | ||
44 | #include "../llprimitive/lltextureanim.h" | ||
45 | 38 | ||
46 | // vector3 | 39 | // vector3 |
40 | class LLVector3; | ||
47 | LLSD ll_sd_from_vector3(const LLVector3& vec); | 41 | LLSD ll_sd_from_vector3(const LLVector3& vec); |
48 | LLVector3 ll_vector3_from_sd(const LLSD& sd, S32 start_index = 0); | 42 | LLVector3 ll_vector3_from_sd(const LLSD& sd, S32 start_index = 0); |
49 | 43 | ||
50 | // vector4 | 44 | // vector4 |
45 | class LLVector4; | ||
51 | LLSD ll_sd_from_vector4(const LLVector4& vec); | 46 | LLSD ll_sd_from_vector4(const LLVector4& vec); |
52 | LLVector4 ll_vector4_from_sd(const LLSD& sd, S32 start_index = 0); | 47 | LLVector4 ll_vector4_from_sd(const LLSD& sd, S32 start_index = 0); |
53 | 48 | ||
54 | // vector3d (double) | 49 | // vector3d (double) |
50 | class LLVector3d; | ||
55 | LLSD ll_sd_from_vector3d(const LLVector3d& vec); | 51 | LLSD ll_sd_from_vector3d(const LLVector3d& vec); |
56 | LLVector3d ll_vector3d_from_sd(const LLSD& sd, S32 start_index = 0); | 52 | LLVector3d ll_vector3d_from_sd(const LLSD& sd, S32 start_index = 0); |
57 | 53 | ||
58 | // vector2 | 54 | // vector2 |
55 | class LLVector2; | ||
59 | LLSD ll_sd_from_vector2(const LLVector2& vec); | 56 | LLSD ll_sd_from_vector2(const LLVector2& vec); |
60 | LLVector2 ll_vector2_from_sd(const LLSD& sd); | 57 | LLVector2 ll_vector2_from_sd(const LLSD& sd); |
61 | 58 | ||
62 | // Quaternion | 59 | // Quaternion |
60 | class LLQuaternion; | ||
63 | LLSD ll_sd_from_quaternion(const LLQuaternion& quat); | 61 | LLSD ll_sd_from_quaternion(const LLQuaternion& quat); |
64 | LLQuaternion ll_quaternion_from_sd(const LLSD& sd); | 62 | LLQuaternion ll_quaternion_from_sd(const LLSD& sd); |
65 | 63 | ||
66 | // color4 | 64 | // color4 |
65 | class LLColor4; | ||
67 | LLSD ll_sd_from_color4(const LLColor4& c); | 66 | LLSD ll_sd_from_color4(const LLColor4& c); |
68 | LLColor4 ll_color4_from_sd(const LLSD& sd); | 67 | LLColor4 ll_color4_from_sd(const LLSD& sd); |
69 | 68 | ||
@@ -93,9 +92,11 @@ char* ll_pretty_print_sd(const LLSD& sd); | |||
93 | 92 | ||
94 | //compares the structure of an LLSD to a template LLSD and stores the | 93 | //compares the structure of an LLSD to a template LLSD and stores the |
95 | //"valid" values in a 3rd LLSD. Default values | 94 | //"valid" values in a 3rd LLSD. Default values |
96 | //are pulled from the template. Ordering of arrays matters | 95 | //are pulled from the template. Extra keys/values in the test |
96 | //are ignored in the resultant LLSD. Ordering of arrays matters | ||
97 | //Returns false if the test is of same type but values differ in type | 97 | //Returns false if the test is of same type but values differ in type |
98 | //Otherwise, returns true | 98 | //Otherwise, returns true |
99 | |||
99 | BOOL compare_llsd_with_template( | 100 | BOOL compare_llsd_with_template( |
100 | const LLSD& llsd_to_test, | 101 | const LLSD& llsd_to_test, |
101 | const LLSD& template_llsd, | 102 | const LLSD& template_llsd, |