Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* LLSD JSON serialization can now take an optional parameter to enable/disable preserving default values in serialization

Browse Source 
* Fixed a regression where OSDMap.ToString() and OSDArray.ToString() were pruning default values after switching from notation output to JSON
* Fixed LLSD decoding to ignore case when parsing headers and use <? llsd/binary ?> instead of <?llsd/binary?>

git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@3357 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
John Hurliman
2010-05-25 23:07:16 +00:00
parent 0dc8e91fed
commit f5a84b39aa
4 changed files with 54 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenMetaverse.StructuredData/JSON/OSDJson.cs
View File

@@ -62,15 +62,20 @@ namespace OpenMetaverse.StructuredData
public static string SerializeJsonString(OSD osd)
{
return SerializeJson(osd).ToJson();
return SerializeJson(osd, false).ToJson();
}
public static void SerializeJsonString(OSD osd, ref JsonWriter writer)
public static string SerializeJsonString(OSD osd, bool preserveDefaults)
{
SerializeJson(osd).ToJson(writer);
return SerializeJson(osd, preserveDefaults).ToJson();
}
public static JsonData SerializeJson(OSD osd)
public static void SerializeJsonString(OSD osd, bool preserveDefaults, ref JsonWriter writer)
{
SerializeJson(osd, preserveDefaults).ToJson(writer);
}
public static JsonData SerializeJson(OSD osd, bool preserveDefaults)
{
switch (osd.Type)
{
@@ -97,7 +102,7 @@ namespace OpenMetaverse.StructuredData
jsonarray.SetJsonType(JsonType.Array);
OSDArray array = (OSDArray)osd;
for (int i = 0; i < array.Count; i++)
jsonarray.Add(SerializeJson(array[i]));
jsonarray.Add(SerializeJson(array[i], preserveDefaults));
return jsonarray;
case OSDType.Map:
JsonData jsonmap = new JsonData();
@@ -105,8 +110,13 @@ namespace OpenMetaverse.StructuredData
OSDMap map = (OSDMap)osd;
foreach (KeyValuePair<string, OSD> kvp in map)
{
// Default values will not be serialized to the jsonmap
JsonData data = SerializeJsonNoDefaults(kvp.Value);
JsonData data;
if (preserveDefaults)
data = SerializeJson(kvp.Value, preserveDefaults);
else
data = SerializeJsonNoDefaults(kvp.Value);
if (data != null)
jsonmap[kvp.Key] = data;
}
@@ -168,7 +178,7 @@ namespace OpenMetaverse.StructuredData
jsonarray.SetJsonType(JsonType.Array);
OSDArray array = (OSDArray)osd;
for (int i = 0; i < array.Count; i++)
jsonarray.Add(SerializeJson(array[i]));
jsonarray.Add(SerializeJson(array[i], false));
return jsonarray;
case OSDType.Map:
JsonData jsonmap = new JsonData();