aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcommon/llsdutil.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:54 -0500
committerJacek Antonelli2008-08-15 23:44:54 -0500
commitb2afb8800bb033a04bb3ecdf0363068d56648ef1 (patch)
tree3568129b5bbddb47cd39d622b4137a8fbff4abaf /linden/indra/llcommon/llsdutil.h
parentSecond Life viewer sources 1.14.0.1 (diff)
downloadmeta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.zip
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.gz
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.bz2
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.xz
Second Life viewer sources 1.15.0.2
Diffstat (limited to '')
-rw-r--r--linden/indra/llcommon/llsdutil.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/linden/indra/llcommon/llsdutil.h b/linden/indra/llcommon/llsdutil.h
index ca6b76f..6344c50 100644
--- a/linden/indra/llcommon/llsdutil.h
+++ b/linden/indra/llcommon/llsdutil.h
@@ -6,6 +6,7 @@
6 * 6 *
7 * Copyright (c) 2006-2007, Linden Research, Inc. 7 * Copyright (c) 2006-2007, Linden Research, Inc.
8 * 8 *
9 * Second Life Viewer Source Code
9 * The source code in this file ("Source Code") is provided by Linden Lab 10 * The source code in this file ("Source Code") is provided by Linden Lab
10 * to you under the terms of the GNU General Public License, version 2.0 11 * to you under the terms of the GNU General Public License, version 2.0
11 * ("GPL"), unless you have obtained a separate licensing agreement 12 * ("GPL"), unless you have obtained a separate licensing agreement
@@ -32,6 +33,7 @@
32 33
33#include "llsd.h" 34#include "llsd.h"
34#include "../llmath/v3math.h" 35#include "../llmath/v3math.h"
36#include "../llmath/v4math.h"
35#include "../llmath/v3dmath.h" 37#include "../llmath/v3dmath.h"
36#include "../llmath/v2math.h" 38#include "../llmath/v2math.h"
37#include "../llmath/llquaternion.h" 39#include "../llmath/llquaternion.h"
@@ -42,6 +44,10 @@
42LLSD ll_sd_from_vector3(const LLVector3& vec); 44LLSD ll_sd_from_vector3(const LLVector3& vec);
43LLVector3 ll_vector3_from_sd(const LLSD& sd, S32 start_index = 0); 45LLVector3 ll_vector3_from_sd(const LLSD& sd, S32 start_index = 0);
44 46
47// vector4
48LLSD ll_sd_from_vector4(const LLVector4& vec);
49LLVector4 ll_vector4_from_sd(const LLSD& sd, S32 start_index = 0);
50
45// vector3d (double) 51// vector3d (double)
46LLSD ll_sd_from_vector3d(const LLVector3d& vec); 52LLSD ll_sd_from_vector3d(const LLVector3d& vec);
47LLVector3d ll_vector3d_from_sd(const LLSD& sd, S32 start_index = 0); 53LLVector3d ll_vector3d_from_sd(const LLSD& sd, S32 start_index = 0);
@@ -73,4 +79,10 @@ U32 ll_ipaddr_from_sd(const LLSD& sd);
73// Binary to string 79// Binary to string
74LLSD ll_string_from_binary(const LLSD& sd); 80LLSD ll_string_from_binary(const LLSD& sd);
75 81
82//String to binary
83LLSD ll_binary_from_string(const LLSD& sd);
84
85// Serializes sd to static buffer and returns pointer, useful for gdb debugging.
86char* ll_print_sd(const LLSD& sd);
87
76#endif // LL_LLSDUTIL_H 88#endif // LL_LLSDUTIL_H