summaryrefslogtreecommitdiff
path: root/indra/llcommon/llsdjson.h
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2015-09-10 16:48:01 -0700
committerRider Linden <rider@lindenlab.com>2015-09-10 16:48:01 -0700
commit6a204b1bddc711b768d598c6ac0a16413f48d3c3 (patch)
treefe4e526394ad1571ea18c9c4de1e0a709143d6d8 /indra/llcommon/llsdjson.h
parenta471ae72e4b48a12cfeeba544afde9d078428f0d (diff)
MAINT-5575: Finished converting experience cache to singleton
MAINT-4952: Coverted VMM to coroutines
Diffstat (limited to 'indra/llcommon/llsdjson.h')
-rw-r--r--indra/llcommon/llsdjson.h18
1 files changed, 18 insertions, 0 deletions
diff --git a/indra/llcommon/llsdjson.h b/indra/llcommon/llsdjson.h
index cdf9fed500..2be7112404 100644
--- a/indra/llcommon/llsdjson.h
+++ b/indra/llcommon/llsdjson.h
@@ -55,5 +55,23 @@
/// Order is preserved for an array but not for objects.
LLSD LlsdFromJson(const Json::Value &val);
+/// Convert an LLSD object into Parsed JSON object maintaining member names and
+/// array indexs.
+///
+/// Types are converted as follows:
+/// LLSD Type | JSON Type
+/// --------------+----------------
+/// TypeUndefined | null
+/// TypeBoolean | boolean
+/// TypeInteger | integer
+/// TypeReal | real/numeric
+/// TypeString | string
+/// TypeURI | string
+/// TypeDate | string
+/// TypeUUID | string
+/// TypeMap | object
+/// TypeArray | array
+/// TypeBinary | unsupported
+Json::Value LlsdToJson(const LLSD &val);
#endif // LL_LLSDJSON_H