From 64f990fa385865770fc1bec39494bf2f920d4c6e Mon Sep 17 00:00:00 2001 From: John Hurliman Date: Sat, 5 Jun 2010 14:12:24 +0000 Subject: [PATCH] * Fixed JSON serialization for null/undefined values * Added MappingType.Spherical and MappingType.Cylindrical enum values git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@3361 52acb1d6-8a22-11de-b505-999d5b087335 --- OpenMetaverse.StructuredData/JSON/OSDJson.cs | 2 +- OpenMetaverse/Primitives/TextureEntry.cs | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/OpenMetaverse.StructuredData/JSON/OSDJson.cs b/OpenMetaverse.StructuredData/JSON/OSDJson.cs index 11616e10..463a86df 100644 --- a/OpenMetaverse.StructuredData/JSON/OSDJson.cs +++ b/OpenMetaverse.StructuredData/JSON/OSDJson.cs @@ -123,7 +123,7 @@ namespace OpenMetaverse.StructuredData return jsonmap; case OSDType.Unknown: default: - return new JsonData(); + return new JsonData(null); } } diff --git a/OpenMetaverse/Primitives/TextureEntry.cs b/OpenMetaverse/Primitives/TextureEntry.cs index e55dfc65..7f51d8f9 100644 --- a/OpenMetaverse/Primitives/TextureEntry.cs +++ b/OpenMetaverse/Primitives/TextureEntry.cs @@ -99,7 +99,11 @@ namespace OpenMetaverse /// Default = 0, /// - Planar = 2 + Planar = 2, + /// + Spherical = 4, + /// + Cylindrical = 6 } ///