diff --git a/OpenMetaverse.Tests/BinaryLLSDTests.cs b/OpenMetaverse.Tests/BinaryLLSDTests.cs
index 922fedcf..ebea3543 100644
--- a/OpenMetaverse.Tests/BinaryLLSDTests.cs
+++ b/OpenMetaverse.Tests/BinaryLLSDTests.cs
@@ -60,42 +60,42 @@ namespace OpenMetaverse.Tests
byte[] sFirstFind = Encoding.ASCII.GetBytes("this");
stream.Position = 0L;
- bool result = LLSDParser.FindByteArray(stream, sFirstFind);
+ bool result = OSDParser.FindByteArray(stream, sFirstFind);
Assert.AreEqual(true, result);
Assert.AreEqual(4L, stream.Position);
stream.Position = 10L;
byte[] sSecondFind = Encoding.ASCII.GetBytes("teststring");
- result = LLSDParser.FindByteArray(stream, sSecondFind);
+ result = OSDParser.FindByteArray(stream, sSecondFind);
Assert.AreEqual(true, result);
Assert.AreEqual(20L, stream.Position);
stream.Position = 25L;
byte[] sThirdNotFind = Encoding.ASCII.GetBytes("notfound");
- result = LLSDParser.FindByteArray(stream, sThirdNotFind);
+ result = OSDParser.FindByteArray(stream, sThirdNotFind);
Assert.AreEqual(false, result);
Assert.AreEqual(25L, stream.Position);
stream.Position = 60L;
byte[] sFourthNotFound = Encoding.ASCII.GetBytes("beginningAndMore");
- result = LLSDParser.FindByteArray(stream, sFourthNotFound);
+ result = OSDParser.FindByteArray(stream, sFourthNotFound);
Assert.AreEqual(false, result);
Assert.AreEqual(60L, stream.Position);
byte[] sFrontWhiteSpace = Encoding.ASCII.GetBytes(" \t\t\n\rtest");
MemoryStream streamTwo = new MemoryStream(sFrontWhiteSpace);
- LLSDParser.SkipWhiteSpace(streamTwo);
+ OSDParser.SkipWhiteSpace(streamTwo);
Assert.AreEqual(7L, streamTwo.Position);
byte[] sMiddleWhiteSpace = Encoding.ASCII.GetBytes("test \t\t\n\rtest");
MemoryStream streamThree = new MemoryStream(sMiddleWhiteSpace);
streamThree.Position = 4L;
- LLSDParser.SkipWhiteSpace(streamThree);
+ OSDParser.SkipWhiteSpace(streamThree);
Assert.AreEqual(9L, streamThree.Position);
byte[] sNoWhiteSpace = Encoding.ASCII.GetBytes("testtesttest");
MemoryStream streamFour = new MemoryStream(sNoWhiteSpace);
- LLSDParser.SkipWhiteSpace(streamFour);
+ OSDParser.SkipWhiteSpace(streamFour);
Assert.AreEqual(0L, streamFour.Position);
}
@@ -107,7 +107,7 @@ namespace OpenMetaverse.Tests
[Test()]
public void DeserializeUndef()
{
- OSD llsdUndef = LLSDParser.DeserializeLLSDBinary(binaryUndef);
+ OSD llsdUndef = OSDParser.DeserializeLLSDBinary(binaryUndef);
Assert.AreEqual(OSDType.Unknown, llsdUndef.Type);
}
@@ -115,7 +115,7 @@ namespace OpenMetaverse.Tests
public void SerializeUndef()
{
OSD llsdUndef = new OSD();
- byte[] binaryUndefSerialized = LLSDParser.SerializeLLSDBinary(llsdUndef);
+ byte[] binaryUndefSerialized = OSDParser.SerializeLLSDBinary(llsdUndef);
Assert.AreEqual(binaryUndef, binaryUndefSerialized);
}
@@ -129,11 +129,11 @@ namespace OpenMetaverse.Tests
[Test()]
public void DeserializeBool()
{
- OSD llsdTrue = LLSDParser.DeserializeLLSDBinary(binaryTrue);
+ OSD llsdTrue = OSDParser.DeserializeLLSDBinary(binaryTrue);
Assert.AreEqual(OSDType.Boolean, llsdTrue.Type);
Assert.AreEqual(true, llsdTrue.AsBoolean());
- OSD llsdFalse = LLSDParser.DeserializeLLSDBinary(binaryFalse);
+ OSD llsdFalse = OSDParser.DeserializeLLSDBinary(binaryFalse);
Assert.AreEqual(OSDType.Boolean, llsdFalse.Type);
Assert.AreEqual(false, llsdFalse.AsBoolean());
}
@@ -142,11 +142,11 @@ namespace OpenMetaverse.Tests
public void SerializeBool()
{
OSD llsdTrue = OSD.FromBoolean(true);
- byte[] binaryTrueSerialized = LLSDParser.SerializeLLSDBinary(llsdTrue);
+ byte[] binaryTrueSerialized = OSDParser.SerializeLLSDBinary(llsdTrue);
Assert.AreEqual(binaryTrue, binaryTrueSerialized);
OSD llsdFalse = OSD.FromBoolean(false);
- byte[] binaryFalseSerialized = LLSDParser.SerializeLLSDBinary(llsdFalse);
+ byte[] binaryFalseSerialized = OSDParser.SerializeLLSDBinary(llsdFalse);
Assert.AreEqual(binaryFalse, binaryFalseSerialized);
}
@@ -159,12 +159,12 @@ namespace OpenMetaverse.Tests
[Test()]
public void DeserializeInteger()
{
- OSD llsdZeroInteger = LLSDParser.DeserializeLLSDBinary(binaryZeroInt);
+ OSD llsdZeroInteger = OSDParser.DeserializeLLSDBinary(binaryZeroInt);
Assert.AreEqual(OSDType.Integer, llsdZeroInteger.Type);
Assert.AreEqual(0, llsdZeroInteger.AsInteger());
- OSD llsdAnInteger = LLSDParser.DeserializeLLSDBinary(binaryAnInt);
+ OSD llsdAnInteger = OSDParser.DeserializeLLSDBinary(binaryAnInt);
Assert.AreEqual(OSDType.Integer, llsdAnInteger.Type);
Assert.AreEqual(1234843, llsdAnInteger.AsInteger());
}
@@ -173,11 +173,11 @@ namespace OpenMetaverse.Tests
public void SerializeInteger()
{
OSD llsdZeroInt = OSD.FromInteger(0);
- byte[] binaryZeroIntSerialized = LLSDParser.SerializeLLSDBinary(llsdZeroInt);
+ byte[] binaryZeroIntSerialized = OSDParser.SerializeLLSDBinary(llsdZeroInt);
Assert.AreEqual(binaryZeroInt, binaryZeroIntSerialized);
OSD llsdAnInt = OSD.FromInteger(1234843);
- byte[] binaryAnIntSerialized = LLSDParser.SerializeLLSDBinary(llsdAnInt);
+ byte[] binaryAnIntSerialized = OSDParser.SerializeLLSDBinary(llsdAnInt);
Assert.AreEqual(binaryAnInt, binaryAnIntSerialized);
}
@@ -187,7 +187,7 @@ namespace OpenMetaverse.Tests
[Test()]
public void DeserializeReal()
{
- OSD llsdReal = LLSDParser.DeserializeLLSDBinary(binaryReal);
+ OSD llsdReal = OSDParser.DeserializeLLSDBinary(binaryReal);
Assert.AreEqual(OSDType.Real, llsdReal.Type);
Assert.AreEqual(947835.234d, llsdReal.AsReal());
}
@@ -196,7 +196,7 @@ namespace OpenMetaverse.Tests
public void SerializeReal()
{
OSD llsdReal = OSD.FromReal(947835.234d);
- byte[] binaryRealSerialized = LLSDParser.SerializeLLSDBinary(llsdReal);
+ byte[] binaryRealSerialized = OSDParser.SerializeLLSDBinary(llsdReal);
Assert.AreEqual(binaryReal, binaryRealSerialized);
}
@@ -211,11 +211,11 @@ namespace OpenMetaverse.Tests
[Test()]
public void DeserializeUUID()
{
- OSD llsdAUUID = LLSDParser.DeserializeLLSDBinary(binaryAUUID);
+ OSD llsdAUUID = OSDParser.DeserializeLLSDBinary(binaryAUUID);
Assert.AreEqual(OSDType.UUID, llsdAUUID.Type);
Assert.AreEqual("97f4aeca-88a1-42a1-b385-b97b18abb255", llsdAUUID.AsString());
- OSD llsdZeroUUID = LLSDParser.DeserializeLLSDBinary(binaryZeroUUID);
+ OSD llsdZeroUUID = OSDParser.DeserializeLLSDBinary(binaryZeroUUID);
Assert.AreEqual(OSDType.UUID, llsdZeroUUID.Type);
Assert.AreEqual("00000000-0000-0000-0000-000000000000", llsdZeroUUID.AsString());
@@ -225,11 +225,11 @@ namespace OpenMetaverse.Tests
public void SerializeUUID()
{
OSD llsdAUUID = OSD.FromUUID(new UUID("97f4aeca-88a1-42a1-b385-b97b18abb255"));
- byte[] binaryAUUIDSerialized = LLSDParser.SerializeLLSDBinary(llsdAUUID);
+ byte[] binaryAUUIDSerialized = OSDParser.SerializeLLSDBinary(llsdAUUID);
Assert.AreEqual(binaryAUUID, binaryAUUIDSerialized);
OSD llsdZeroUUID = OSD.FromUUID(new UUID("00000000-0000-0000-0000-000000000000"));
- byte[] binaryZeroUUIDSerialized = LLSDParser.SerializeLLSDBinary(llsdZeroUUID);
+ byte[] binaryZeroUUIDSerialized = OSDParser.SerializeLLSDBinary(llsdZeroUUID);
Assert.AreEqual(binaryZeroUUID, binaryZeroUUIDSerialized);
}
@@ -243,7 +243,7 @@ namespace OpenMetaverse.Tests
[Test()]
public void DeserializeLLSDBinary()
{
- OSD llsdBytes = LLSDParser.DeserializeLLSDBinary(binaryBinString);
+ OSD llsdBytes = OSDParser.DeserializeLLSDBinary(binaryBinString);
Assert.AreEqual(OSDType.Binary, llsdBytes.Type);
byte[] contentBinString = { 0x74, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x67, 0x20, 0x61, 0x20, 0x73,
0x69, 0x6d, 0x70, 0x6c, 0x65, 0x20, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x20, 0x63, 0x6f,
@@ -260,7 +260,7 @@ namespace OpenMetaverse.Tests
0x6e, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x74, 0x68,
0x69, 0x73, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0xa, 0xd };
OSD llsdBinary = OSD.FromBinary(contentBinString);
- byte[] binaryBinarySerialized = LLSDParser.SerializeLLSDBinary(llsdBinary);
+ byte[] binaryBinarySerialized = OSDParser.SerializeLLSDBinary(llsdBinary);
Assert.AreEqual(binaryBinString, binaryBinarySerialized);
}
@@ -278,12 +278,12 @@ namespace OpenMetaverse.Tests
[Test()]
public void DeserializeString()
{
- OSD llsdEmptyString = LLSDParser.DeserializeLLSDBinary(binaryEmptyString);
+ OSD llsdEmptyString = OSDParser.DeserializeLLSDBinary(binaryEmptyString);
Assert.AreEqual(OSDType.String, llsdEmptyString.Type);
string contentEmptyString = "";
Assert.AreEqual(contentEmptyString, llsdEmptyString.AsString());
- OSD llsdLongString = LLSDParser.DeserializeLLSDBinary(binaryLongString);
+ OSD llsdLongString = OSDParser.DeserializeLLSDBinary(binaryLongString);
Assert.AreEqual(OSDType.String, llsdLongString.Type);
string contentLongString = "abcdefghijklmnopqrstuvwxyz01234567890";
Assert.AreEqual(contentLongString, llsdLongString.AsString());
@@ -293,7 +293,7 @@ namespace OpenMetaverse.Tests
public void SerializeString()
{
OSD llsdString = OSD.FromString("abcdefghijklmnopqrstuvwxyz01234567890");
- byte[] binaryLongStringSerialized = LLSDParser.SerializeLLSDBinary(llsdString);
+ byte[] binaryLongStringSerialized = OSDParser.SerializeLLSDBinary(llsdString);
Assert.AreEqual(binaryLongString, binaryLongStringSerialized);
// A test with some utf8 characters
@@ -305,8 +305,8 @@ namespace OpenMetaverse.Tests
string contentAString = xtr.ReadString();
OSD llsdAString = OSD.FromString(contentAString);
- byte[] binaryAString = LLSDParser.SerializeLLSDBinary(llsdAString);
- OSD llsdAStringDS = LLSDParser.DeserializeLLSDBinary(binaryAString);
+ byte[] binaryAString = OSDParser.SerializeLLSDBinary(llsdAString);
+ OSD llsdAStringDS = OSDParser.DeserializeLLSDBinary(binaryAString);
Assert.AreEqual(OSDType.String, llsdAStringDS.Type);
Assert.AreEqual(contentAString, llsdAStringDS.AsString());
@@ -319,8 +319,8 @@ namespace OpenMetaverse.Tests
string content = xtrTwo.ReadString();
OSD llsdStringOne = OSD.FromString(content);
- byte[] binaryAStringOneSerialized = LLSDParser.SerializeLLSDBinary(llsdStringOne);
- OSD llsdStringOneDS = LLSDParser.DeserializeLLSDBinary(binaryAStringOneSerialized);
+ byte[] binaryAStringOneSerialized = OSDParser.SerializeLLSDBinary(llsdStringOne);
+ OSD llsdStringOneDS = OSDParser.DeserializeLLSDBinary(binaryAStringOneSerialized);
Assert.AreEqual(OSDType.String, llsdStringOneDS.Type);
Assert.AreEqual(content, llsdStringOneDS.AsString());
@@ -337,7 +337,7 @@ namespace OpenMetaverse.Tests
[Test()]
public void DeserializeURI()
{
- OSD llsdURI = LLSDParser.DeserializeLLSDBinary(binaryURI);
+ OSD llsdURI = OSDParser.DeserializeLLSDBinary(binaryURI);
Assert.AreEqual(OSDType.URI, llsdURI.Type);
Uri uri = new Uri("http://www.testurl.test/");
Assert.AreEqual(uri, llsdURI.AsUri());
@@ -348,7 +348,7 @@ namespace OpenMetaverse.Tests
public void SerializeURI()
{
OSD llsdUri = OSD.FromUri(new Uri("http://www.testurl.test/"));
- byte[] binaryURISerialized = LLSDParser.SerializeLLSDBinary(llsdUri);
+ byte[] binaryURISerialized = OSDParser.SerializeLLSDBinary(llsdUri);
Assert.AreEqual(binaryURI, binaryURISerialized);
}
@@ -363,7 +363,7 @@ namespace OpenMetaverse.Tests
[Test()]
public void DeserializeDateTime()
{
- OSD llsdDateTime = LLSDParser.DeserializeLLSDBinary(binaryDateTime);
+ OSD llsdDateTime = OSDParser.DeserializeLLSDBinary(binaryDateTime);
Assert.AreEqual(OSDType.Date, llsdDateTime.Type);
DateTime dt = new DateTime(2008, 1, 1, 20, 10, 31, 0, DateTimeKind.Utc);
DateTime dateLocal = llsdDateTime.AsDate();
@@ -375,21 +375,21 @@ namespace OpenMetaverse.Tests
{
DateTime dt = new DateTime(2008, 1, 1, 20, 10, 31, 0, DateTimeKind.Utc);
OSD llsdDate = OSD.FromDate(dt);
- byte[] binaryDateSerialized = LLSDParser.SerializeLLSDBinary(llsdDate);
+ byte[] binaryDateSerialized = OSDParser.SerializeLLSDBinary(llsdDate);
Assert.AreEqual(binaryDateTime, binaryDateSerialized);
// check if a *local* time can be serialized and deserialized
DateTime dtOne = new DateTime(2009, 12, 30, 8, 25, 10, DateTimeKind.Local);
OSD llsdDateOne = OSD.FromDate(dtOne);
- byte[] binaryDateOneSerialized = LLSDParser.SerializeLLSDBinary(llsdDateOne);
- OSD llsdDateOneDS = LLSDParser.DeserializeLLSDBinary(binaryDateOneSerialized);
+ byte[] binaryDateOneSerialized = OSDParser.SerializeLLSDBinary(llsdDateOne);
+ OSD llsdDateOneDS = OSDParser.DeserializeLLSDBinary(binaryDateOneSerialized);
Assert.AreEqual(OSDType.Date, llsdDateOneDS.Type);
Assert.AreEqual(dtOne, llsdDateOneDS.AsDate());
DateTime dtTwo = new DateTime(2010, 11, 11, 10, 8, 20, DateTimeKind.Utc);
OSD llsdDateTwo = OSD.FromDate(dtTwo);
- byte[] binaryDateTwoSerialized = LLSDParser.SerializeLLSDBinary(llsdDateTwo);
- OSD llsdDateTwoDS = LLSDParser.DeserializeLLSDBinary(binaryDateTwoSerialized);
+ byte[] binaryDateTwoSerialized = OSDParser.SerializeLLSDBinary(llsdDateTwo);
+ OSD llsdDateTwoDS = OSDParser.DeserializeLLSDBinary(binaryDateTwoSerialized);
Assert.AreEqual(OSDType.Date, llsdDateOneDS.Type);
Assert.AreEqual(dtTwo.ToLocalTime(), llsdDateTwoDS.AsDate());
@@ -413,20 +413,20 @@ namespace OpenMetaverse.Tests
[Test()]
public void DeserializeArray()
{
- OSD llsdEmptyArray = LLSDParser.DeserializeLLSDBinary(binaryEmptyArray);
+ OSD llsdEmptyArray = OSDParser.DeserializeLLSDBinary(binaryEmptyArray);
Assert.AreEqual(OSDType.Array, llsdEmptyArray.Type);
OSDArray llsdEmptyArrayArray = (OSDArray)llsdEmptyArray;
Assert.AreEqual(0, llsdEmptyArrayArray.Count);
- OSD llsdSimpleArray = LLSDParser.DeserializeLLSDBinary(binarySimpleArray);
+ OSD llsdSimpleArray = OSDParser.DeserializeLLSDBinary(binarySimpleArray);
Assert.AreEqual(OSDType.Array, llsdSimpleArray.Type);
OSDArray llsdArray = (OSDArray)llsdSimpleArray;
Assert.AreEqual(OSDType.Integer, llsdArray[0].Type);
Assert.AreEqual(0, llsdArray[0].AsInteger());
- OSD llsdSimpleArrayTwo = LLSDParser.DeserializeLLSDBinary(binarySimpleArrayTwo);
+ OSD llsdSimpleArrayTwo = OSDParser.DeserializeLLSDBinary(binarySimpleArrayTwo);
Assert.AreEqual(OSDType.Array, llsdSimpleArrayTwo.Type);
OSDArray llsdArrayTwo = (OSDArray)llsdSimpleArrayTwo;
Assert.AreEqual(2, llsdArrayTwo.Count);
@@ -441,18 +441,18 @@ namespace OpenMetaverse.Tests
public void SerializeArray()
{
OSDArray llsdEmptyArray = new OSDArray();
- byte[] binaryEmptyArraySerialized = LLSDParser.SerializeLLSDBinary(llsdEmptyArray);
+ byte[] binaryEmptyArraySerialized = OSDParser.SerializeLLSDBinary(llsdEmptyArray);
Assert.AreEqual(binaryEmptyArray, binaryEmptyArraySerialized);
OSDArray llsdSimpleArray = new OSDArray();
llsdSimpleArray.Add(OSD.FromInteger(0));
- byte[] binarySimpleArraySerialized = LLSDParser.SerializeLLSDBinary(llsdSimpleArray);
+ byte[] binarySimpleArraySerialized = OSDParser.SerializeLLSDBinary(llsdSimpleArray);
Assert.AreEqual(binarySimpleArray, binarySimpleArraySerialized);
OSDArray llsdSimpleArrayTwo = new OSDArray();
llsdSimpleArrayTwo.Add(OSD.FromInteger(0));
llsdSimpleArrayTwo.Add(OSD.FromInteger(0));
- byte[] binarySimpleArrayTwoSerialized = LLSDParser.SerializeLLSDBinary(llsdSimpleArrayTwo);
+ byte[] binarySimpleArrayTwoSerialized = OSDParser.SerializeLLSDBinary(llsdSimpleArrayTwo);
Assert.AreEqual(binarySimpleArrayTwo, binarySimpleArrayTwoSerialized);
}
@@ -487,17 +487,17 @@ namespace OpenMetaverse.Tests
[Test()]
public void DeserializeDictionary()
{
- OSDMap llsdEmptyMap = (OSDMap)LLSDParser.DeserializeLLSDBinary(binaryEmptyMap);
+ OSDMap llsdEmptyMap = (OSDMap)OSDParser.DeserializeLLSDBinary(binaryEmptyMap);
Assert.AreEqual(OSDType.Map, llsdEmptyMap.Type);
Assert.AreEqual(0, llsdEmptyMap.Count);
- OSDMap llsdSimpleMap = (OSDMap)LLSDParser.DeserializeLLSDBinary(binarySimpleMap);
+ OSDMap llsdSimpleMap = (OSDMap)OSDParser.DeserializeLLSDBinary(binarySimpleMap);
Assert.AreEqual(OSDType.Map, llsdSimpleMap.Type);
Assert.AreEqual(1, llsdSimpleMap.Count);
Assert.AreEqual(OSDType.Integer, llsdSimpleMap["test"].Type);
Assert.AreEqual(0, llsdSimpleMap["test"].AsInteger());
- OSDMap llsdSimpleMapTwo = (OSDMap)LLSDParser.DeserializeLLSDBinary(binarySimpleMapTwo);
+ OSDMap llsdSimpleMapTwo = (OSDMap)OSDParser.DeserializeLLSDBinary(binarySimpleMapTwo);
Assert.AreEqual(OSDType.Map, llsdSimpleMapTwo.Type);
Assert.AreEqual(3, llsdSimpleMapTwo.Count);
Assert.AreEqual(OSDType.Unknown, llsdSimpleMapTwo["test"].Type);
@@ -513,24 +513,24 @@ namespace OpenMetaverse.Tests
public void SerializeDictionary()
{
OSDMap llsdEmptyMap = new OSDMap();
- byte[] binaryEmptyMapSerialized = LLSDParser.SerializeLLSDBinary(llsdEmptyMap);
+ byte[] binaryEmptyMapSerialized = OSDParser.SerializeLLSDBinary(llsdEmptyMap);
Assert.AreEqual(binaryEmptyMap, binaryEmptyMapSerialized);
OSDMap llsdSimpleMap = new OSDMap();
llsdSimpleMap["test"] = OSD.FromInteger(0);
- byte[] binarySimpleMapSerialized = LLSDParser.SerializeLLSDBinary(llsdSimpleMap);
+ byte[] binarySimpleMapSerialized = OSDParser.SerializeLLSDBinary(llsdSimpleMap);
Assert.AreEqual(binarySimpleMap, binarySimpleMapSerialized);
OSDMap llsdSimpleMapTwo = new OSDMap();
llsdSimpleMapTwo["t0st"] = OSD.FromInteger(241);
llsdSimpleMapTwo["tes1"] = OSD.FromString("aha");
llsdSimpleMapTwo["test"] = new OSD();
- byte[] binarySimpleMapTwoSerialized = LLSDParser.SerializeLLSDBinary(llsdSimpleMapTwo);
+ byte[] binarySimpleMapTwoSerialized = OSDParser.SerializeLLSDBinary(llsdSimpleMapTwo);
// We dont compare here to the original serialized value, because, as maps dont preserve order,
// the original serialized value is not *exactly* the same. Instead we compare to a deserialized
// version created by this deserializer.
- OSDMap llsdSimpleMapDeserialized = (OSDMap)LLSDParser.DeserializeLLSDBinary(binarySimpleMapTwoSerialized);
+ OSDMap llsdSimpleMapDeserialized = (OSDMap)OSDParser.DeserializeLLSDBinary(binarySimpleMapTwoSerialized);
Assert.AreEqual(OSDType.Map, llsdSimpleMapDeserialized.Type);
Assert.AreEqual(3, llsdSimpleMapDeserialized.Count);
Assert.AreEqual(OSDType.Integer, llsdSimpleMapDeserialized["t0st"].Type);
@@ -552,8 +552,8 @@ namespace OpenMetaverse.Tests
llsdSimpleMapThree[content] = llsdSimpleValue;
Assert.AreEqual(content, llsdSimpleMapThree[content].AsString());
- byte[] binarySimpleMapThree = LLSDParser.SerializeLLSDBinary(llsdSimpleMapThree);
- OSDMap llsdSimpleMapThreeDS = (OSDMap)LLSDParser.DeserializeLLSDBinary(binarySimpleMapThree);
+ byte[] binarySimpleMapThree = OSDParser.SerializeLLSDBinary(llsdSimpleMapThree);
+ OSDMap llsdSimpleMapThreeDS = (OSDMap)OSDParser.DeserializeLLSDBinary(binarySimpleMapThree);
Assert.AreEqual(OSDType.Map, llsdSimpleMapThreeDS.Type);
Assert.AreEqual(1, llsdSimpleMapThreeDS.Count);
Assert.AreEqual(content, llsdSimpleMapThreeDS[content].AsString());
@@ -579,7 +579,7 @@ namespace OpenMetaverse.Tests
[Test()]
public void DeserializeNestedComposite()
{
- OSD llsdNested = LLSDParser.DeserializeLLSDBinary(binaryNested);
+ OSD llsdNested = OSDParser.DeserializeLLSDBinary(binaryNested);
Assert.AreEqual(OSDType.Array, llsdNested.Type);
OSDArray llsdArray = (OSDArray)llsdNested;
Assert.AreEqual(3, llsdArray.Count);
@@ -624,9 +624,9 @@ namespace OpenMetaverse.Tests
llsdNested.Add(OSD.FromInteger(124));
llsdNested.Add(OSD.FromInteger(987));
- byte[] binaryNestedSerialized = LLSDParser.SerializeLLSDBinary(llsdNested);
+ byte[] binaryNestedSerialized = OSDParser.SerializeLLSDBinary(llsdNested);
// Because maps don't preserve order, we compare here to a deserialized value.
- OSDArray llsdNestedDeserialized = (OSDArray)LLSDParser.DeserializeLLSDBinary(binaryNestedSerialized);
+ OSDArray llsdNestedDeserialized = (OSDArray)OSDParser.DeserializeLLSDBinary(binaryNestedSerialized);
Assert.AreEqual(OSDType.Array, llsdNestedDeserialized.Type);
Assert.AreEqual(3, llsdNestedDeserialized.Count);
@@ -677,9 +677,9 @@ namespace OpenMetaverse.Tests
llsdMap["testTen"] = stringTwo;
- byte[] binaryData = LLSDParser.SerializeLLSDBinary( llsdMap );
+ byte[] binaryData = OSDParser.SerializeLLSDBinary( llsdMap );
- OSDMap llsdMapDS = (OSDMap)LLSDParser.DeserializeLLSDBinary( binaryData );
+ OSDMap llsdMapDS = (OSDMap)OSDParser.DeserializeLLSDBinary( binaryData );
Assert.AreEqual( OSDType.Map, llsdMapDS.Type );
Assert.AreEqual( 10, llsdMapDS.Count );
Assert.AreEqual( sOne, llsdMapDS["testOne"].AsString());
diff --git a/OpenMetaverse.Tests/NotationLLSDTests.cs b/OpenMetaverse.Tests/NotationLLSDTests.cs
index 37d4e793..c58a64b1 100644
--- a/OpenMetaverse.Tests/NotationLLSDTests.cs
+++ b/OpenMetaverse.Tests/NotationLLSDTests.cs
@@ -55,22 +55,22 @@ namespace OpenMetaverse.Tests
StringReader reader = new StringReader("test1tast2test3");
char[] charsOne = { 't', 'e', 's', 't' };
- int resultOne = LLSDParser.BufferCharactersEqual(reader, charsOne, 0);
+ int resultOne = OSDParser.BufferCharactersEqual(reader, charsOne, 0);
Assert.AreEqual(charsOne.Length, resultOne);
char[] charsTwo = { '1', 't', 'e' };
- int resultTwo = LLSDParser.BufferCharactersEqual(reader, charsTwo, 0);
+ int resultTwo = OSDParser.BufferCharactersEqual(reader, charsTwo, 0);
Assert.AreEqual(2, resultTwo);
char[] charsThree = { 'a', 's', 't', '2', 't', 'e', 's' };
- int resultThree = LLSDParser.BufferCharactersEqual(reader, charsThree, 1);
+ int resultThree = OSDParser.BufferCharactersEqual(reader, charsThree, 1);
Assert.AreEqual(1, resultThree);
- int resultFour = LLSDParser.BufferCharactersEqual(reader, charsThree, 0);
+ int resultFour = OSDParser.BufferCharactersEqual(reader, charsThree, 0);
Assert.AreEqual(charsThree.Length, resultFour);
char[] charsFive = { 't', '3', 'a', 'a' };
- int resultFive = LLSDParser.BufferCharactersEqual(reader, charsFive, 0);
+ int resultFive = OSDParser.BufferCharactersEqual(reader, charsFive, 0);
Assert.AreEqual(2, resultFive);
@@ -80,7 +80,7 @@ namespace OpenMetaverse.Tests
public void DeserializeUndef()
{
String s = "!";
- OSD llsd = LLSDParser.DeserializeLLSDNotation(s);
+ OSD llsd = OSDParser.DeserializeLLSDNotation(s);
Assert.AreEqual(OSDType.Unknown, llsd.Type);
}
@@ -88,9 +88,9 @@ namespace OpenMetaverse.Tests
public void SerializeUndef()
{
OSD llsd = new OSD();
- string s = LLSDParser.SerializeLLSDNotation(llsd);
+ string s = OSDParser.SerializeLLSDNotation(llsd);
- OSD llsdDS = LLSDParser.DeserializeLLSDNotation(s);
+ OSD llsdDS = OSDParser.DeserializeLLSDNotation(s);
Assert.AreEqual(OSDType.Unknown, llsdDS.Type);
}
@@ -98,52 +98,52 @@ namespace OpenMetaverse.Tests
public void DeserializeBoolean()
{
String t = "true";
- OSD llsdT = LLSDParser.DeserializeLLSDNotation(t);
+ OSD llsdT = OSDParser.DeserializeLLSDNotation(t);
Assert.AreEqual(OSDType.Boolean, llsdT.Type);
Assert.AreEqual(true, llsdT.AsBoolean());
String tTwo = "t";
- OSD llsdTTwo = LLSDParser.DeserializeLLSDNotation(tTwo);
+ OSD llsdTTwo = OSDParser.DeserializeLLSDNotation(tTwo);
Assert.AreEqual(OSDType.Boolean, llsdTTwo.Type);
Assert.AreEqual(true, llsdTTwo.AsBoolean());
String tThree = "TRUE";
- OSD llsdTThree = LLSDParser.DeserializeLLSDNotation(tThree);
+ OSD llsdTThree = OSDParser.DeserializeLLSDNotation(tThree);
Assert.AreEqual(OSDType.Boolean, llsdTThree.Type);
Assert.AreEqual(true, llsdTThree.AsBoolean());
String tFour = "T";
- OSD llsdTFour = LLSDParser.DeserializeLLSDNotation(tFour);
+ OSD llsdTFour = OSDParser.DeserializeLLSDNotation(tFour);
Assert.AreEqual(OSDType.Boolean, llsdTFour.Type);
Assert.AreEqual(true, llsdTFour.AsBoolean());
String tFive = "1";
- OSD llsdTFive = LLSDParser.DeserializeLLSDNotation(tFive);
+ OSD llsdTFive = OSDParser.DeserializeLLSDNotation(tFive);
Assert.AreEqual(OSDType.Boolean, llsdTFive.Type);
Assert.AreEqual(true, llsdTFive.AsBoolean());
String f = "false";
- OSD llsdF = LLSDParser.DeserializeLLSDNotation(f);
+ OSD llsdF = OSDParser.DeserializeLLSDNotation(f);
Assert.AreEqual(OSDType.Boolean, llsdF.Type);
Assert.AreEqual(false, llsdF.AsBoolean());
String fTwo = "f";
- OSD llsdFTwo = LLSDParser.DeserializeLLSDNotation(fTwo);
+ OSD llsdFTwo = OSDParser.DeserializeLLSDNotation(fTwo);
Assert.AreEqual(OSDType.Boolean, llsdFTwo.Type);
Assert.AreEqual(false, llsdFTwo.AsBoolean());
String fThree = "FALSE";
- OSD llsdFThree = LLSDParser.DeserializeLLSDNotation(fThree);
+ OSD llsdFThree = OSDParser.DeserializeLLSDNotation(fThree);
Assert.AreEqual(OSDType.Boolean, llsdFThree.Type);
Assert.AreEqual(false, llsdFThree.AsBoolean());
String fFour = "F";
- OSD llsdFFour = LLSDParser.DeserializeLLSDNotation(fFour);
+ OSD llsdFFour = OSDParser.DeserializeLLSDNotation(fFour);
Assert.AreEqual(OSDType.Boolean, llsdFFour.Type);
Assert.AreEqual(false, llsdFFour.AsBoolean());
String fFive = "0";
- OSD llsdFFive = LLSDParser.DeserializeLLSDNotation(fFive);
+ OSD llsdFFive = OSDParser.DeserializeLLSDNotation(fFive);
Assert.AreEqual(OSDType.Boolean, llsdFFive.Type);
Assert.AreEqual(false, llsdFFive.AsBoolean());
}
@@ -152,14 +152,14 @@ namespace OpenMetaverse.Tests
public void SerializeBoolean()
{
OSD llsdTrue = OSD.FromBoolean(true);
- string sTrue = LLSDParser.SerializeLLSDNotation(llsdTrue);
- OSD llsdTrueDS = LLSDParser.DeserializeLLSDNotation(sTrue);
+ string sTrue = OSDParser.SerializeLLSDNotation(llsdTrue);
+ OSD llsdTrueDS = OSDParser.DeserializeLLSDNotation(sTrue);
Assert.AreEqual(OSDType.Boolean, llsdTrueDS.Type);
Assert.AreEqual(true, llsdTrueDS.AsBoolean());
OSD llsdFalse = OSD.FromBoolean(false);
- string sFalse = LLSDParser.SerializeLLSDNotation(llsdFalse);
- OSD llsdFalseDS = LLSDParser.DeserializeLLSDNotation(sFalse);
+ string sFalse = OSDParser.SerializeLLSDNotation(llsdFalse);
+ OSD llsdFalseDS = OSDParser.DeserializeLLSDNotation(sFalse);
Assert.AreEqual(OSDType.Boolean, llsdFalseDS.Type);
Assert.AreEqual(false, llsdFalseDS.AsBoolean());
}
@@ -168,12 +168,12 @@ namespace OpenMetaverse.Tests
public void DeserializeInteger()
{
string integerOne = "i12319423";
- OSD llsdOne = LLSDParser.DeserializeLLSDNotation(integerOne);
+ OSD llsdOne = OSDParser.DeserializeLLSDNotation(integerOne);
Assert.AreEqual(OSDType.Integer, llsdOne.Type);
Assert.AreEqual(12319423, llsdOne.AsInteger());
string integerTwo = "i-489234";
- OSD llsdTwo = LLSDParser.DeserializeLLSDNotation(integerTwo);
+ OSD llsdTwo = OSDParser.DeserializeLLSDNotation(integerTwo);
Assert.AreEqual(OSDType.Integer, llsdTwo.Type);
Assert.AreEqual(-489234, llsdTwo.AsInteger());
}
@@ -182,14 +182,14 @@ namespace OpenMetaverse.Tests
public void SerializeInteger()
{
OSD llsdOne = OSD.FromInteger(12319423);
- string sOne = LLSDParser.SerializeLLSDNotation(llsdOne);
- OSD llsdOneDS = LLSDParser.DeserializeLLSDNotation(sOne);
+ string sOne = OSDParser.SerializeLLSDNotation(llsdOne);
+ OSD llsdOneDS = OSDParser.DeserializeLLSDNotation(sOne);
Assert.AreEqual(OSDType.Integer, llsdOneDS.Type);
Assert.AreEqual(12319423, llsdOne.AsInteger());
OSD llsdTwo = OSD.FromInteger(-71892034);
- string sTwo = LLSDParser.SerializeLLSDNotation(llsdTwo);
- OSD llsdTwoDS = LLSDParser.DeserializeLLSDNotation(sTwo);
+ string sTwo = OSDParser.SerializeLLSDNotation(llsdTwo);
+ OSD llsdTwoDS = OSDParser.DeserializeLLSDNotation(sTwo);
Assert.AreEqual(OSDType.Integer, llsdTwoDS.Type);
Assert.AreEqual(-71892034, llsdTwoDS.AsInteger());
}
@@ -198,27 +198,27 @@ namespace OpenMetaverse.Tests
public void DeserializeReal()
{
String realOne = "r1123412345.465711";
- OSD llsdOne = LLSDParser.DeserializeLLSDNotation(realOne);
+ OSD llsdOne = OSDParser.DeserializeLLSDNotation(realOne);
Assert.AreEqual(OSDType.Real, llsdOne.Type);
Assert.AreEqual(1123412345.465711d, llsdOne.AsReal());
String realTwo = "r-11234684.923411";
- OSD llsdTwo = LLSDParser.DeserializeLLSDNotation(realTwo);
+ OSD llsdTwo = OSDParser.DeserializeLLSDNotation(realTwo);
Assert.AreEqual(OSDType.Real, llsdTwo.Type);
Assert.AreEqual(-11234684.923411d, llsdTwo.AsReal());
String realThree = "r1";
- OSD llsdThree = LLSDParser.DeserializeLLSDNotation(realThree);
+ OSD llsdThree = OSDParser.DeserializeLLSDNotation(realThree);
Assert.AreEqual(OSDType.Real, llsdThree.Type);
Assert.AreEqual(1d, llsdThree.AsReal());
String realFour = "r2.0193899999999998204e-06";
- OSD llsdFour = LLSDParser.DeserializeLLSDNotation(realFour);
+ OSD llsdFour = OSDParser.DeserializeLLSDNotation(realFour);
Assert.AreEqual(OSDType.Real, llsdFour.Type);
Assert.AreEqual(2.0193899999999998204e-06d, llsdFour.AsReal());
String realFive = "r0";
- OSD llsdFive = LLSDParser.DeserializeLLSDNotation(realFive);
+ OSD llsdFive = OSDParser.DeserializeLLSDNotation(realFive);
Assert.AreEqual(OSDType.Real, llsdFive.Type);
Assert.AreEqual(0d, llsdFive.AsReal());
}
@@ -227,41 +227,38 @@ namespace OpenMetaverse.Tests
public void SerializeReal()
{
OSD llsdOne = OSD.FromReal(12987234.723847d);
- string sOne = LLSDParser.SerializeLLSDNotation(llsdOne);
- OSD llsdOneDS = LLSDParser.DeserializeLLSDNotation(sOne);
+ string sOne = OSDParser.SerializeLLSDNotation(llsdOne);
+ OSD llsdOneDS = OSDParser.DeserializeLLSDNotation(sOne);
Assert.AreEqual(OSDType.Real, llsdOneDS.Type);
Assert.AreEqual(12987234.723847d, llsdOneDS.AsReal());
OSD llsdTwo = OSD.FromReal(-32347892.234234d);
- string sTwo = LLSDParser.SerializeLLSDNotation(llsdTwo);
- OSD llsdTwoDS = LLSDParser.DeserializeLLSDNotation(sTwo);
+ string sTwo = OSDParser.SerializeLLSDNotation(llsdTwo);
+ OSD llsdTwoDS = OSDParser.DeserializeLLSDNotation(sTwo);
Assert.AreEqual(OSDType.Real, llsdTwoDS.Type);
Assert.AreEqual(-32347892.234234d, llsdTwoDS.AsReal());
- /* The following two tests don't pass on mono 1.9, as
- * mono isnt able to parse its own Double.Max/MinValue.
- */
- // SD llsdThree = SD.FromReal( Double.MaxValue );
- // string sThree = LLSDParser.SerializeLLSDNotation( llsdThree );
- // SD llsdThreeDS = LLSDParser.DeserializeLLSDNotation( sThree );
- // Assert.AreEqual( SDType.Real, llsdThreeDS.Type );
- // Assert.AreEqual( Double.MaxValue, llsdThreeDS.AsReal());
- //
- // SD llsdFour = SD.FromReal( Double.MinValue );
- // string sFour = LLSDParser.SerializeLLSDNotation( llsdFour );
- // SD llsdFourDS = LLSDParser.DeserializeLLSDNotation( sFour );
- // Assert.AreEqual( SDType.Real, llsdFourDS.Type );
- // Assert.AreEqual( Double.MinValue, llsdFourDS.AsReal());
+ OSD llsdThree = OSD.FromReal( Double.MaxValue );
+ string sThree = OSDParser.SerializeLLSDNotation( llsdThree );
+ OSD llsdThreeDS = OSDParser.DeserializeLLSDNotation( sThree );
+ Assert.AreEqual( OSDType.Real, llsdThreeDS.Type );
+ Assert.AreEqual( Double.MaxValue, llsdThreeDS.AsReal());
+
+ OSD llsdFour = OSD.FromReal(Double.MinValue);
+ string sFour = OSDParser.SerializeLLSDNotation(llsdFour);
+ OSD llsdFourDS = OSDParser.DeserializeLLSDNotation(sFour);
+ Assert.AreEqual(OSDType.Real, llsdFourDS.Type);
+ Assert.AreEqual(Double.MinValue, llsdFourDS.AsReal());
OSD llsdFive = OSD.FromReal(-1.1123123E+50d);
- string sFive = LLSDParser.SerializeLLSDNotation(llsdFive);
- OSD llsdFiveDS = LLSDParser.DeserializeLLSDNotation(sFive);
+ string sFive = OSDParser.SerializeLLSDNotation(llsdFive);
+ OSD llsdFiveDS = OSDParser.DeserializeLLSDNotation(sFive);
Assert.AreEqual(OSDType.Real, llsdFiveDS.Type);
Assert.AreEqual(-1.1123123E+50d, llsdFiveDS.AsReal());
OSD llsdSix = OSD.FromReal(2.0193899999999998204e-06);
- string sSix = LLSDParser.SerializeLLSDNotation(llsdSix);
- OSD llsdSixDS = LLSDParser.DeserializeLLSDNotation(sSix);
+ string sSix = OSDParser.SerializeLLSDNotation(llsdSix);
+ OSD llsdSixDS = OSDParser.DeserializeLLSDNotation(sSix);
Assert.AreEqual(OSDType.Real, llsdSixDS.Type);
Assert.AreEqual(2.0193899999999998204e-06, llsdSixDS.AsReal());
@@ -272,12 +269,12 @@ namespace OpenMetaverse.Tests
public void DeserializeUUID()
{
String uuidOne = "u97f4aeca-88a1-42a1-b385-b97b18abb255";
- OSD llsdOne = LLSDParser.DeserializeLLSDNotation(uuidOne);
+ OSD llsdOne = OSDParser.DeserializeLLSDNotation(uuidOne);
Assert.AreEqual(OSDType.UUID, llsdOne.Type);
Assert.AreEqual("97f4aeca-88a1-42a1-b385-b97b18abb255", llsdOne.AsString());
String uuidTwo = "u00000000-0000-0000-0000-000000000000";
- OSD llsdTwo = LLSDParser.DeserializeLLSDNotation(uuidTwo);
+ OSD llsdTwo = OSDParser.DeserializeLLSDNotation(uuidTwo);
Assert.AreEqual(OSDType.UUID, llsdTwo.Type);
Assert.AreEqual("00000000-0000-0000-0000-000000000000", llsdTwo.AsString());
}
@@ -286,14 +283,14 @@ namespace OpenMetaverse.Tests
public void SerializeUUID()
{
OSD llsdOne = OSD.FromUUID(new UUID("97f4aeca-88a1-42a1-b385-b97b18abb255"));
- string sOne = LLSDParser.SerializeLLSDNotation(llsdOne);
- OSD llsdOneDS = LLSDParser.DeserializeLLSDNotation(sOne);
+ string sOne = OSDParser.SerializeLLSDNotation(llsdOne);
+ OSD llsdOneDS = OSDParser.DeserializeLLSDNotation(sOne);
Assert.AreEqual(OSDType.UUID, llsdOneDS.Type);
Assert.AreEqual("97f4aeca-88a1-42a1-b385-b97b18abb255", llsdOneDS.AsString());
OSD llsdTwo = OSD.FromUUID(new UUID("00000000-0000-0000-0000-000000000000"));
- string sTwo = LLSDParser.SerializeLLSDNotation(llsdTwo);
- OSD llsdTwoDS = LLSDParser.DeserializeLLSDNotation(sTwo);
+ string sTwo = OSDParser.SerializeLLSDNotation(llsdTwo);
+ OSD llsdTwoDS = OSDParser.DeserializeLLSDNotation(sTwo);
Assert.AreEqual(OSDType.UUID, llsdTwoDS.Type);
Assert.AreEqual("00000000-0000-0000-0000-000000000000", llsdTwoDS.AsString());
}
@@ -301,13 +298,13 @@ namespace OpenMetaverse.Tests
public void DeserializeString()
{
string sOne = "''";
- OSD llsdOne = LLSDParser.DeserializeLLSDNotation(sOne);
+ OSD llsdOne = OSDParser.DeserializeLLSDNotation(sOne);
Assert.AreEqual(OSDType.String, llsdOne.Type);
Assert.AreEqual("", llsdOne.AsString());
// This is double escaping. Once for the encoding, and once for csharp.
string sTwo = "'test\\'\"test'";
- OSD llsdTwo = LLSDParser.DeserializeLLSDNotation(sTwo);
+ OSD llsdTwo = OSDParser.DeserializeLLSDNotation(sTwo);
Assert.AreEqual(OSDType.String, llsdTwo.Type);
Assert.AreEqual("test'\"test", llsdTwo.AsString());
@@ -316,34 +313,34 @@ namespace OpenMetaverse.Tests
(char)0x5c, (char)0x6c, (char)0x65, (char)0x73, (char)0x74, (char)0x27 };
string sThree = new string(cThree);
- OSD llsdThree = LLSDParser.DeserializeLLSDNotation(sThree);
+ OSD llsdThree = OSDParser.DeserializeLLSDNotation(sThree);
Assert.AreEqual(OSDType.String, llsdThree.Type);
Assert.AreEqual("test \\lest", llsdThree.AsString());
string sFour = "'aa\t la'";
- OSD llsdFour = LLSDParser.DeserializeLLSDNotation(sFour);
+ OSD llsdFour = OSDParser.DeserializeLLSDNotation(sFour);
Assert.AreEqual(OSDType.String, llsdFour.Type);
Assert.AreEqual("aa\t la", llsdFour.AsString());
char[] cFive = { (char)0x27, (char)0x5c, (char)0x5c, (char)0x27 };
string sFive = new String(cFive);
- OSD llsdFive = LLSDParser.DeserializeLLSDNotation(sFive);
+ OSD llsdFive = OSDParser.DeserializeLLSDNotation(sFive);
Assert.AreEqual(OSDType.String, llsdFive.Type);
Assert.AreEqual("\\", llsdFive.AsString());
string sSix = "s(10)\"1234567890\"";
- OSD llsdSix = LLSDParser.DeserializeLLSDNotation(sSix);
+ OSD llsdSix = OSDParser.DeserializeLLSDNotation(sSix);
Assert.AreEqual(OSDType.String, llsdSix.Type);
Assert.AreEqual("1234567890", llsdSix.AsString());
string sSeven = "s(5)\"\\\\\\\\\\\"";
- OSD llsdSeven = LLSDParser.DeserializeLLSDNotation(sSeven);
+ OSD llsdSeven = OSDParser.DeserializeLLSDNotation(sSeven);
Assert.AreEqual(OSDType.String, llsdSeven.Type);
Assert.AreEqual("\\\\\\\\\\", llsdSeven.AsString());
string sEight = "\"aouAOUhsdjklfghskldjfghqeiurtzwieortzaslxfjkgh\"";
- OSD llsdEight = LLSDParser.DeserializeLLSDNotation(sEight);
+ OSD llsdEight = OSDParser.DeserializeLLSDNotation(sEight);
Assert.AreEqual(OSDType.String, llsdEight.Type);
Assert.AreEqual("aouAOUhsdjklfghskldjfghqeiurtzwieortzaslxfjkgh", llsdEight.AsString());
@@ -354,8 +351,8 @@ namespace OpenMetaverse.Tests
public void DoSomeStringSerializingActionsAndAsserts(string s)
{
OSD llsdOne = OSD.FromString(s);
- string sOne = LLSDParser.SerializeLLSDNotation(llsdOne);
- OSD llsdOneDS = LLSDParser.DeserializeLLSDNotation(sOne);
+ string sOne = OSDParser.SerializeLLSDNotation(llsdOne);
+ OSD llsdOneDS = OSDParser.DeserializeLLSDNotation(sOne);
Assert.AreEqual(OSDType.String, llsdOne.Type);
Assert.AreEqual(s, llsdOneDS.AsString());
}
@@ -399,12 +396,12 @@ namespace OpenMetaverse.Tests
public void DeserializeURI()
{
string sUriOne = "l\"http://test.com/test test>\\\"/&yes\"";
- OSD llsdOne = LLSDParser.DeserializeLLSDNotation(sUriOne);
+ OSD llsdOne = OSDParser.DeserializeLLSDNotation(sUriOne);
Assert.AreEqual(OSDType.URI, llsdOne.Type);
Assert.AreEqual("http://test.com/test test>\"/&yes", llsdOne.AsString());
string sUriTwo = "l\"test/test/test?test=1&toast=2\"";
- OSD llsdTwo = LLSDParser.DeserializeLLSDNotation(sUriTwo);
+ OSD llsdTwo = OSDParser.DeserializeLLSDNotation(sUriTwo);
Assert.AreEqual(OSDType.URI, llsdTwo.Type);
Assert.AreEqual("test/test/test?test=1&toast=2", llsdTwo.AsString());
}
@@ -414,15 +411,15 @@ namespace OpenMetaverse.Tests
{
Uri uriOne = new Uri("http://test.org/test test>\\\"/&yes\"", UriKind.RelativeOrAbsolute);
OSD llsdOne = OSD.FromUri(uriOne);
- string sUriOne = LLSDParser.SerializeLLSDNotation(llsdOne);
- OSD llsdOneDS = LLSDParser.DeserializeLLSDNotation(sUriOne);
+ string sUriOne = OSDParser.SerializeLLSDNotation(llsdOne);
+ OSD llsdOneDS = OSDParser.DeserializeLLSDNotation(sUriOne);
Assert.AreEqual(OSDType.URI, llsdOneDS.Type);
Assert.AreEqual(uriOne, llsdOneDS.AsUri());
Uri uriTwo = new Uri("test/test/near/the/end?test=1", UriKind.RelativeOrAbsolute);
OSD llsdTwo = OSD.FromUri(uriTwo);
- string sUriTwo = LLSDParser.SerializeLLSDNotation(llsdTwo);
- OSD llsdTwoDS = LLSDParser.DeserializeLLSDNotation(sUriTwo);
+ string sUriTwo = OSDParser.SerializeLLSDNotation(llsdTwo);
+ OSD llsdTwoDS = OSDParser.DeserializeLLSDNotation(sUriTwo);
Assert.AreEqual(OSDType.URI, llsdTwoDS.Type);
Assert.AreEqual(uriTwo, llsdTwoDS.AsUri());
}
@@ -431,7 +428,7 @@ namespace OpenMetaverse.Tests
public void DeserializeDate()
{
string sDateOne = "d\"2007-12-31T20:49:10Z\"";
- OSD llsdOne = LLSDParser.DeserializeLLSDNotation(sDateOne);
+ OSD llsdOne = OSDParser.DeserializeLLSDNotation(sDateOne);
Assert.AreEqual(OSDType.Date, llsdOne.Type);
DateTime dt = new DateTime(2007, 12, 31, 20, 49, 10, 0, DateTimeKind.Utc);
DateTime dtDS = llsdOne.AsDate();
@@ -443,16 +440,16 @@ namespace OpenMetaverse.Tests
{
DateTime dtOne = new DateTime(2005, 8, 10, 11, 23, 4, DateTimeKind.Utc);
OSD llsdOne = OSD.FromDate(dtOne);
- string sDtOne = LLSDParser.SerializeLLSDNotation(llsdOne);
- OSD llsdOneDS = LLSDParser.DeserializeLLSDNotation(sDtOne);
+ string sDtOne = OSDParser.SerializeLLSDNotation(llsdOne);
+ OSD llsdOneDS = OSDParser.DeserializeLLSDNotation(sDtOne);
Assert.AreEqual(OSDType.Date, llsdOneDS.Type);
DateTime dtOneDS = llsdOneDS.AsDate();
Assert.AreEqual(dtOne, dtOneDS.ToUniversalTime());
DateTime dtTwo = new DateTime(2010, 10, 11, 23, 00, 10, 100, DateTimeKind.Utc);
OSD llsdTwo = OSD.FromDate(dtTwo);
- string sDtTwo = LLSDParser.SerializeLLSDNotation(llsdTwo);
- OSD llsdTwoDS = LLSDParser.DeserializeLLSDNotation(sDtTwo);
+ string sDtTwo = OSDParser.SerializeLLSDNotation(llsdTwo);
+ OSD llsdTwoDS = OSDParser.DeserializeLLSDNotation(sDtTwo);
Assert.AreEqual(OSDType.Date, llsdTwoDS.Type);
DateTime dtTwoDS = llsdTwoDS.AsDate();
Assert.AreEqual(dtTwo, dtTwoDS.ToUniversalTime());
@@ -460,8 +457,8 @@ namespace OpenMetaverse.Tests
// check if a *local* time can be serialized and deserialized
DateTime dtThree = new DateTime(2009, 12, 30, 8, 25, 10, DateTimeKind.Local);
OSD llsdDateThree = OSD.FromDate(dtThree);
- string sDateThreeSerialized = LLSDParser.SerializeLLSDNotation(llsdDateThree);
- OSD llsdDateThreeDS = LLSDParser.DeserializeLLSDNotation(sDateThreeSerialized);
+ string sDateThreeSerialized = OSDParser.SerializeLLSDNotation(llsdDateThree);
+ OSD llsdDateThreeDS = OSDParser.DeserializeLLSDNotation(sDateThreeSerialized);
Assert.AreEqual(OSDType.Date, llsdDateThreeDS.Type);
Assert.AreEqual(dtThree, llsdDateThreeDS.AsDate());
}
@@ -473,8 +470,8 @@ namespace OpenMetaverse.Tests
0x0b, 0x0c, 0x0d, 0x0e, 0x0f };
OSD llsdBinary = OSD.FromBinary(binary);
- string sBinarySerialized = LLSDParser.SerializeLLSDNotation(llsdBinary);
- OSD llsdBinaryDS = LLSDParser.DeserializeLLSDNotation(sBinarySerialized);
+ string sBinarySerialized = OSDParser.SerializeLLSDNotation(llsdBinary);
+ OSD llsdBinaryDS = OSDParser.DeserializeLLSDNotation(sBinarySerialized);
Assert.AreEqual(OSDType.Binary, llsdBinaryDS.Type);
Assert.AreEqual(binary, llsdBinaryDS.AsBinary());
}
@@ -483,12 +480,12 @@ namespace OpenMetaverse.Tests
public void DeserializeArray()
{
string sArrayOne = "[]";
- OSDArray llsdArrayOne = (OSDArray)LLSDParser.DeserializeLLSDNotation(sArrayOne);
+ OSDArray llsdArrayOne = (OSDArray)OSDParser.DeserializeLLSDNotation(sArrayOne);
Assert.AreEqual(OSDType.Array, llsdArrayOne.Type);
Assert.AreEqual(0, llsdArrayOne.Count);
string sArrayTwo = "[ i0 ]";
- OSDArray llsdArrayTwo = (OSDArray)LLSDParser.DeserializeLLSDNotation(sArrayTwo);
+ OSDArray llsdArrayTwo = (OSDArray)OSDParser.DeserializeLLSDNotation(sArrayTwo);
Assert.AreEqual(OSDType.Array, llsdArrayTwo.Type);
Assert.AreEqual(1, llsdArrayTwo.Count);
OSDInteger llsdIntOne = (OSDInteger)llsdArrayTwo[0];
@@ -496,7 +493,7 @@ namespace OpenMetaverse.Tests
Assert.AreEqual(0, llsdIntOne.AsInteger());
string sArrayThree = "[ i0, i1 ]";
- OSDArray llsdArrayThree = (OSDArray)LLSDParser.DeserializeLLSDNotation(sArrayThree);
+ OSDArray llsdArrayThree = (OSDArray)OSDParser.DeserializeLLSDNotation(sArrayThree);
Assert.AreEqual(OSDType.Array, llsdArrayThree.Type);
Assert.AreEqual(2, llsdArrayThree.Count);
OSDInteger llsdIntTwo = (OSDInteger)llsdArrayThree[0];
@@ -507,7 +504,7 @@ namespace OpenMetaverse.Tests
Assert.AreEqual(1, llsdIntThree.AsInteger());
string sArrayFour = " [ \"testtest\", \"aha\",t,f,i1, r1.2, [ i1] ] ";
- OSDArray llsdArrayFour = (OSDArray)LLSDParser.DeserializeLLSDNotation(sArrayFour);
+ OSDArray llsdArrayFour = (OSDArray)OSDParser.DeserializeLLSDNotation(sArrayFour);
Assert.AreEqual(OSDType.Array, llsdArrayFour.Type);
Assert.AreEqual(7, llsdArrayFour.Count);
Assert.AreEqual("testtest", llsdArrayFour[0].AsString());
@@ -526,8 +523,8 @@ namespace OpenMetaverse.Tests
public void SerializeArray()
{
OSDArray llsdOne = new OSDArray();
- string sOne = LLSDParser.SerializeLLSDNotation(llsdOne);
- OSDArray llsdOneDS = (OSDArray)LLSDParser.DeserializeLLSDNotation(sOne);
+ string sOne = OSDParser.SerializeLLSDNotation(llsdOne);
+ OSDArray llsdOneDS = (OSDArray)OSDParser.DeserializeLLSDNotation(sOne);
Assert.AreEqual(OSDType.Array, llsdOneDS.Type);
Assert.AreEqual(0, llsdOneDS.Count);
@@ -541,8 +538,8 @@ namespace OpenMetaverse.Tests
llsdOne.Add(llsdThree);
llsdOne.Add(llsdFour);
- string sFive = LLSDParser.SerializeLLSDNotation(llsdOne);
- OSDArray llsdFive = (OSDArray)LLSDParser.DeserializeLLSDNotation(sFive);
+ string sFive = OSDParser.SerializeLLSDNotation(llsdOne);
+ OSDArray llsdFive = (OSDArray)OSDParser.DeserializeLLSDNotation(sFive);
Assert.AreEqual(OSDType.Array, llsdFive.Type);
Assert.AreEqual(3, llsdFive.Count);
Assert.AreEqual(OSDType.Integer, llsdFive[0].Type);
@@ -563,19 +560,19 @@ namespace OpenMetaverse.Tests
public void DeserializeMap()
{
string sMapOne = " { } ";
- OSDMap llsdMapOne = (OSDMap)LLSDParser.DeserializeLLSDNotation(sMapOne);
+ OSDMap llsdMapOne = (OSDMap)OSDParser.DeserializeLLSDNotation(sMapOne);
Assert.AreEqual(OSDType.Map, llsdMapOne.Type);
Assert.AreEqual(0, llsdMapOne.Count);
string sMapTwo = " { \"test\":i2 } ";
- OSDMap llsdMapTwo = (OSDMap)LLSDParser.DeserializeLLSDNotation(sMapTwo);
+ OSDMap llsdMapTwo = (OSDMap)OSDParser.DeserializeLLSDNotation(sMapTwo);
Assert.AreEqual(OSDType.Map, llsdMapTwo.Type);
Assert.AreEqual(1, llsdMapTwo.Count);
Assert.AreEqual(OSDType.Integer, llsdMapTwo["test"].Type);
Assert.AreEqual(2, llsdMapTwo["test"].AsInteger());
string sMapThree = " { 'test':\"testtesttest\", 'aha':\"muahahaha\" , \"anywhere\":! } ";
- OSDMap llsdMapThree = (OSDMap)LLSDParser.DeserializeLLSDNotation(sMapThree);
+ OSDMap llsdMapThree = (OSDMap)OSDParser.DeserializeLLSDNotation(sMapThree);
Assert.AreEqual(OSDType.Map, llsdMapThree.Type);
Assert.AreEqual(3, llsdMapThree.Count);
Assert.AreEqual(OSDType.String, llsdMapThree["test"].Type);
@@ -585,7 +582,7 @@ namespace OpenMetaverse.Tests
Assert.AreEqual(OSDType.Unknown, llsdMapThree["self"].Type);
string sMapFour = " { 'test' : { 'test' : i1, 't0st' : r2.5 }, 'tist' : \"hello world!\", 'tast' : \"last\" } ";
- OSDMap llsdMapFour = (OSDMap)LLSDParser.DeserializeLLSDNotation(sMapFour);
+ OSDMap llsdMapFour = (OSDMap)OSDParser.DeserializeLLSDNotation(sMapFour);
Assert.AreEqual(OSDType.Map, llsdMapFour.Type);
Assert.AreEqual(3, llsdMapFour.Count);
Assert.AreEqual("hello world!", llsdMapFour["tist"].AsString());
@@ -604,8 +601,8 @@ namespace OpenMetaverse.Tests
public void SerializeMap()
{
OSDMap llsdOne = new OSDMap();
- string sOne = LLSDParser.SerializeLLSDNotation(llsdOne);
- OSDMap llsdOneDS = (OSDMap)LLSDParser.DeserializeLLSDNotation(sOne);
+ string sOne = OSDParser.SerializeLLSDNotation(llsdOne);
+ OSDMap llsdOneDS = (OSDMap)OSDParser.DeserializeLLSDNotation(sOne);
Assert.AreEqual(OSDType.Map, llsdOneDS.Type);
Assert.AreEqual(0, llsdOneDS.Count);
@@ -619,8 +616,8 @@ namespace OpenMetaverse.Tests
llsdOne["test1"] = llsdThree;
llsdOne["test2"] = llsdFour;
- string sFive = LLSDParser.SerializeLLSDNotation(llsdOne);
- OSDMap llsdFive = (OSDMap)LLSDParser.DeserializeLLSDNotation(sFive);
+ string sFive = OSDParser.SerializeLLSDNotation(llsdOne);
+ OSDMap llsdFive = (OSDMap)OSDParser.DeserializeLLSDNotation(sFive);
Assert.AreEqual(OSDType.Map, llsdFive.Type);
Assert.AreEqual(3, llsdFive.Count);
Assert.AreEqual(OSDType.Integer, llsdFive["test0"].Type);
@@ -646,8 +643,8 @@ namespace OpenMetaverse.Tests
OSDMap llsdSeven = new OSDMap();
llsdSeven[content] = OSD.FromString(content);
- string sSeven = LLSDParser.SerializeLLSDNotation(llsdSeven);
- OSDMap llsdSevenDS = (OSDMap)LLSDParser.DeserializeLLSDNotation(sSeven);
+ string sSeven = OSDParser.SerializeLLSDNotation(llsdSeven);
+ OSDMap llsdSevenDS = (OSDMap)OSDParser.DeserializeLLSDNotation(sSeven);
Assert.AreEqual(OSDType.Map, llsdSevenDS.Type);
Assert.AreEqual(1, llsdSevenDS.Count);
Assert.AreEqual(content, llsdSevenDS[content].AsString());
@@ -686,7 +683,7 @@ namespace OpenMetaverse.Tests
]";
// We dont do full testing here. We are fine if a few values are right
// and the parser doesnt throw an exception
- OSDArray llsdArray = (OSDArray)LLSDParser.DeserializeLLSDNotation(realWorldExample);
+ OSDArray llsdArray = (OSDArray)OSDParser.DeserializeLLSDNotation(realWorldExample);
Assert.AreEqual(OSDType.Array, llsdArray.Type);
Assert.AreEqual(3, llsdArray.Count);
@@ -717,7 +714,7 @@ namespace OpenMetaverse.Tests
llsdArray.Add(llsdOne);
llsdArray.Add(llsdTwo);
- string sOne = LLSDParser.SerializeLLSDNotationFormatted(llsdArray);
+ string sOne = OSDParser.SerializeLLSDNotationFormatted(llsdArray);
Console.Write(sOne);
OSDMap llsdMap = new OSDMap();
@@ -728,7 +725,7 @@ namespace OpenMetaverse.Tests
llsdArray.Add(llsdMap);
- string sTwo = LLSDParser.SerializeLLSDNotationFormatted(llsdArray);
+ string sTwo = OSDParser.SerializeLLSDNotationFormatted(llsdArray);
Console.Write(sTwo);
OSDArray llsdArrayTwo = new OSDArray();
@@ -739,11 +736,11 @@ namespace OpenMetaverse.Tests
llsdMap["test3"] = llsdArrayTwo;
- string sThree = LLSDParser.SerializeLLSDNotationFormatted(llsdArray);
+ string sThree = OSDParser.SerializeLLSDNotationFormatted(llsdArray);
Console.Write(sThree);
// we also try to parse this... and look a little at the results
- OSDArray llsdSeven = (OSDArray)LLSDParser.DeserializeLLSDNotation(sThree);
+ OSDArray llsdSeven = (OSDArray)OSDParser.DeserializeLLSDNotation(sThree);
Assert.AreEqual(OSDType.Array, llsdSeven.Type);
Assert.AreEqual(3, llsdSeven.Count);
Assert.AreEqual(OSDType.Integer, llsdSeven[0].Type);
diff --git a/OpenMetaverse.Tests/TypeTests.cs b/OpenMetaverse.Tests/TypeTests.cs
index 0eb9f981..e5029649 100644
--- a/OpenMetaverse.Tests/TypeTests.cs
+++ b/OpenMetaverse.Tests/TypeTests.cs
@@ -208,7 +208,7 @@ namespace OpenMetaverse.Tests
string testTwo = "[[r1,r1,r1],r0]";
string testThree = "{'region_handle':[r255232, r256512], 'position':[r33.6, r33.71, r43.13], 'look_at':[r34.6, r33.71, r43.13]}";
- OSD obj = LLSDParser.DeserializeLLSDNotation(testOne);
+ OSD obj = OSDParser.DeserializeLLSDNotation(testOne);
Assert.IsInstanceOfType(typeof(OSDArray), obj, "Expected SDArray, got " + obj.GetType().ToString());
OSDArray array = (OSDArray)obj;
Assert.IsTrue(array.Count == 3, "Expected three contained objects, got " + array.Count);
@@ -216,7 +216,7 @@ namespace OpenMetaverse.Tests
Assert.IsTrue(array[1].AsReal() < 0.0d && array[1].AsReal() > -0.03d, "Unexpected value for second real " + array[1].AsReal());
Assert.IsTrue(array[2].AsReal() == 0.0d, "Unexpected value for third real " + array[2].AsReal());
- obj = LLSDParser.DeserializeLLSDNotation(testTwo);
+ obj = OSDParser.DeserializeLLSDNotation(testTwo);
Assert.IsInstanceOfType(typeof(OSDArray), obj, "Expected SDArray, got " + obj.GetType().ToString());
array = (OSDArray)obj;
Assert.IsTrue(array.Count == 2, "Expected two contained objects, got " + array.Count);
@@ -228,7 +228,7 @@ namespace OpenMetaverse.Tests
"Unexpected value(s) for nested array: " + array[0].AsReal() + ", " + array[1].AsReal() + ", " +
array[2].AsReal());
- obj = LLSDParser.DeserializeLLSDNotation(testThree);
+ obj = OSDParser.DeserializeLLSDNotation(testThree);
Assert.IsInstanceOfType(typeof(OSDMap), obj, "Expected LLSDMap, got " + obj.GetType().ToString());
OSDMap hashtable = (OSDMap)obj;
Assert.IsTrue(hashtable.Count == 3, "Expected three contained objects, got " + hashtable.Count);
diff --git a/OpenMetaverse.Tests/XmlLLSDTests.cs b/OpenMetaverse.Tests/XmlLLSDTests.cs
index a9841b69..fa56d43d 100644
--- a/OpenMetaverse.Tests/XmlLLSDTests.cs
+++ b/OpenMetaverse.Tests/XmlLLSDTests.cs
@@ -82,7 +82,7 @@ namespace OpenMetaverse.Tests
//Deserialize the string
byte[] bytes = Encoding.UTF8.GetBytes(testSD);
- theSD = LLSDParser.DeserializeLLSDXml(bytes);
+ theSD = OSDParser.DeserializeLLSDXml(bytes);
//Confirm the contents
Assert.IsNotNull(theSD);
@@ -177,7 +177,7 @@ namespace OpenMetaverse.Tests
";
//Deserialize the string
byte[] bytes = Encoding.UTF8.GetBytes(testSD);
- theSD = LLSDParser.DeserializeLLSDXml(bytes);
+ theSD = OSDParser.DeserializeLLSDXml(bytes);
Assert.IsTrue(theSD is OSDArray);
array = (OSDArray)theSD;
@@ -224,7 +224,7 @@ namespace OpenMetaverse.Tests
";
//Deserialize the string
byte[] bytes = Encoding.UTF8.GetBytes(testSD);
- theSD = LLSDParser.DeserializeLLSDXml(bytes);
+ theSD = OSDParser.DeserializeLLSDXml(bytes);
Assert.IsTrue(theSD is OSDArray);
array = (OSDArray)theSD;
@@ -274,7 +274,7 @@ namespace OpenMetaverse.Tests
";
//Deserialize the string
byte[] bytes = Encoding.UTF8.GetBytes(testSD);
- theSD = LLSDParser.DeserializeLLSDXml(bytes);
+ theSD = OSDParser.DeserializeLLSDXml(bytes);
Assert.IsTrue(theSD is OSDArray);
array = (OSDArray)theSD;
@@ -319,7 +319,7 @@ namespace OpenMetaverse.Tests
";
//Deserialize the string
byte[] bytes = Encoding.UTF8.GetBytes(testSD);
- theSD = LLSDParser.DeserializeLLSDXml(bytes);
+ theSD = OSDParser.DeserializeLLSDXml(bytes);
Assert.IsTrue(theSD is OSDArray);
array = (OSDArray)theSD;
@@ -354,7 +354,7 @@ namespace OpenMetaverse.Tests
";
//Deserialize the string
byte[] bytes = Encoding.UTF8.GetBytes(testSD);
- theSD = LLSDParser.DeserializeLLSDXml(bytes);
+ theSD = OSDParser.DeserializeLLSDXml(bytes);
Assert.IsTrue(theSD is OSDArray);
array = (OSDArray)theSD;
@@ -396,7 +396,7 @@ namespace OpenMetaverse.Tests
";
//Deserialize the string
byte[] bytes = Encoding.UTF8.GetBytes(testSD);
- theSD = LLSDParser.DeserializeLLSDXml(bytes);
+ theSD = OSDParser.DeserializeLLSDXml(bytes);
Assert.IsTrue(theSD is OSDArray);
array = (OSDArray)theSD;
@@ -443,7 +443,7 @@ namespace OpenMetaverse.Tests
//Deserialize the string
byte[] bytes = Encoding.UTF8.GetBytes(testSD);
- theSD = LLSDParser.DeserializeLLSDXml(bytes);
+ theSD = OSDParser.DeserializeLLSDXml(bytes);
Assert.IsTrue(theSD is OSDArray);
array = (OSDArray)theSD;
@@ -501,7 +501,7 @@ namespace OpenMetaverse.Tests
";
//Deserialize the string
byte[] bytes = Encoding.UTF8.GetBytes(testSD);
- theSD = LLSDParser.DeserializeLLSDXml(bytes);
+ theSD = OSDParser.DeserializeLLSDXml(bytes);
Assert.IsTrue(theSD is OSD);
}
@@ -525,7 +525,7 @@ namespace OpenMetaverse.Tests
";
//Deserialize the string
byte[] bytes = Encoding.UTF8.GetBytes(testSD);
- theSD = LLSDParser.DeserializeLLSDXml(bytes);
+ theSD = OSDParser.DeserializeLLSDXml(bytes);
Assert.IsTrue(theSD is OSDArray);
array = (OSDArray)theSD;
@@ -578,7 +578,7 @@ namespace OpenMetaverse.Tests
";
//Deserialize the string
byte[] bytes = Encoding.UTF8.GetBytes(testSD);
- theSD = LLSDParser.DeserializeLLSDXml(bytes);
+ theSD = OSDParser.DeserializeLLSDXml(bytes);
Assert.IsTrue(theSD is OSDArray);
array = (OSDArray)theSD;
diff --git a/OpenMetaverse.Utilities/RegistrationApi.cs b/OpenMetaverse.Utilities/RegistrationApi.cs
index 988f416e..c89af7b1 100644
--- a/OpenMetaverse.Utilities/RegistrationApi.cs
+++ b/OpenMetaverse.Utilities/RegistrationApi.cs
@@ -246,7 +246,7 @@ namespace OpenMetaverse
OSDMap query = new OSDMap();
query.Add("username", OSD.FromString(firstName));
query.Add("last_name_id", OSD.FromInteger(lastName.ID));
- //byte[] postData = LLSDParser.SerializeXmlBytes(query);
+ //byte[] postData = OSDParser.SerializeXmlBytes(query);
CapsClient request = new CapsClient(_caps.CheckName);
request.OnComplete += new CapsClient.CompleteCallback(CheckNameResponse);
@@ -311,7 +311,7 @@ namespace OpenMetaverse
query.Add("start_look_at_z", OSD.FromReal(user.StartLookAt.Value.Z));
}
- //byte[] postData = LLSDParser.SerializeXmlBytes(query);
+ //byte[] postData = OSDParser.SerializeXmlBytes(query);
// Make the request
CapsClient request = new CapsClient(_caps.CreateUser);
diff --git a/OpenMetaverse/AgentManager.cs b/OpenMetaverse/AgentManager.cs
index 310b6d6f..143f5694 100644
--- a/OpenMetaverse/AgentManager.cs
+++ b/OpenMetaverse/AgentManager.cs
@@ -3309,7 +3309,7 @@ namespace OpenMetaverse
req.Add("session-id", OSD.FromUUID(sessionID));
- byte[] postData = StructuredData.LLSDParser.SerializeLLSDXmlBytes(req);
+ byte[] postData = StructuredData.OSDParser.SerializeLLSDXmlBytes(req);
CapsClient request = new CapsClient(url);
request.StartRequest(postData);
diff --git a/OpenMetaverse/Capabilities/CapsClient.cs b/OpenMetaverse/Capabilities/CapsClient.cs
index f78b748f..5d941fab 100644
--- a/OpenMetaverse/Capabilities/CapsClient.cs
+++ b/OpenMetaverse/Capabilities/CapsClient.cs
@@ -62,7 +62,7 @@ namespace OpenMetaverse.Capabilities
public void StartRequest(OSD llsd)
{
- byte[] postData = LLSDParser.SerializeLLSDXmlBytes(llsd);
+ byte[] postData = OSDParser.SerializeLLSDXmlBytes(llsd);
StartRequest(postData, null);
}
@@ -137,7 +137,7 @@ namespace OpenMetaverse.Capabilities
{
if (e.Error == null)
{
- OSD result = LLSDParser.DeserializeLLSDXml(e.Result);
+ OSD result = OSDParser.DeserializeLLSDXml(e.Result);
try { OnComplete(this, result, e.Error); }
catch (Exception ex) { Logger.Log(ex.Message, Helpers.LogLevel.Error, ex); }
@@ -188,7 +188,7 @@ namespace OpenMetaverse.Capabilities
{
if (e.Error == null)
{
- OSD result = LLSDParser.DeserializeLLSDXml(e.Result);
+ OSD result = OSDParser.DeserializeLLSDXml(e.Result);
try { OnComplete(this, result, e.Error); }
catch (Exception ex) { Logger.Log(ex.Message, Helpers.LogLevel.Error, ex); }
diff --git a/OpenMetaverse/Capabilities/EventQueueClient.cs b/OpenMetaverse/Capabilities/EventQueueClient.cs
index e61767ab..1a7d7b64 100644
--- a/OpenMetaverse/Capabilities/EventQueueClient.cs
+++ b/OpenMetaverse/Capabilities/EventQueueClient.cs
@@ -107,7 +107,7 @@ namespace OpenMetaverse.Capabilities
request["ack"] = new OSD();
request["done"] = OSD.FromBoolean(false);
- byte[] postData = LLSDParser.SerializeLLSDXmlBytes(request);
+ byte[] postData = OSDParser.SerializeLLSDXmlBytes(request);
_Client.UploadDataAsync(_Client.Location, postData);
@@ -174,7 +174,7 @@ namespace OpenMetaverse.Capabilities
else if (!e.Cancelled && e.Result != null)
{
// Got a response
- OSD result = LLSDParser.DeserializeLLSDXml(e.Result);
+ OSD result = OSDParser.DeserializeLLSDXml(e.Result);
if (result != null && result.Type == OSDType.Map)
{
// Parse any events returned by the event queue
@@ -197,7 +197,7 @@ namespace OpenMetaverse.Capabilities
else request["ack"] = new OSD();
request["done"] = OSD.FromBoolean(_Dead);
- byte[] postData = LLSDParser.SerializeLLSDXmlBytes(request);
+ byte[] postData = OSDParser.SerializeLLSDXmlBytes(request);
_Client.UploadDataAsync(_Client.Location, postData);
diff --git a/OpenMetaverse/CapsToPacket.cs b/OpenMetaverse/CapsToPacket.cs
index dec7045f..7a5edfcc 100644
--- a/OpenMetaverse/CapsToPacket.cs
+++ b/OpenMetaverse/CapsToPacket.cs
@@ -38,7 +38,7 @@ namespace OpenMetaverse.Packets
public static string ToXmlString(Packet packet)
{
- return LLSDParser.SerializeLLSDXmlString(GetLLSD(packet));
+ return OSDParser.SerializeLLSDXmlString(GetLLSD(packet));
}
public static OSD GetLLSD(Packet packet)
@@ -80,7 +80,7 @@ namespace OpenMetaverse.Packets
public static byte[] ToBinary(Packet packet)
{
- return LLSDParser.SerializeLLSDBinary(GetLLSD(packet));
+ return OSDParser.SerializeLLSDBinary(GetLLSD(packet));
}
public static Packet FromXmlString(string xml)
@@ -88,7 +88,7 @@ namespace OpenMetaverse.Packets
System.Xml.XmlTextReader reader =
new System.Xml.XmlTextReader(new System.IO.MemoryStream(Utils.StringToBytes(xml)));
- return FromLLSD(LLSDParser.DeserializeLLSDXml(reader));
+ return FromLLSD(OSDParser.DeserializeLLSDXml(reader));
}
public static Packet FromLLSD(OSD osd)
diff --git a/OpenMetaverse/GroupManager.cs b/OpenMetaverse/GroupManager.cs
index 88739c04..4e6bbd76 100644
--- a/OpenMetaverse/GroupManager.cs
+++ b/OpenMetaverse/GroupManager.cs
@@ -241,7 +241,7 @@ namespace OpenMetaverse
att.Add("item_id", OpenMetaverse.StructuredData.OSD.FromUUID(AttachmentID));
att.Add("owner_id", OpenMetaverse.StructuredData.OSD.FromUUID(OwnerID));
- return OpenMetaverse.StructuredData.LLSDParser.SerializeLLSDXmlBytes(att);
+ return OpenMetaverse.StructuredData.OSDParser.SerializeLLSDXmlBytes(att);
/*
//I guess this is how this works, no gaurentees
diff --git a/OpenMetaverse/InventoryManager.cs b/OpenMetaverse/InventoryManager.cs
index 35585048..17578741 100644
--- a/OpenMetaverse/InventoryManager.cs
+++ b/OpenMetaverse/InventoryManager.cs
@@ -1942,7 +1942,7 @@ namespace OpenMetaverse
OSDMap query = new OSDMap();
query.Add("item_id", OSD.FromUUID(notecardID));
- byte[] postData = StructuredData.LLSDParser.SerializeLLSDXmlBytes(query);
+ byte[] postData = StructuredData.OSDParser.SerializeLLSDXmlBytes(query);
// Make the request
CapsClient request = new CapsClient(url);
diff --git a/OpenMetaverse/Login.cs b/OpenMetaverse/Login.cs
index 0c3012fa..43eecc53 100644
--- a/OpenMetaverse/Login.cs
+++ b/OpenMetaverse/Login.cs
@@ -149,7 +149,7 @@ namespace OpenMetaverse
// Home
OSDMap home = null;
- OSD osdHome = LLSDParser.DeserializeLLSDNotation(reply["home"].AsString());
+ OSD osdHome = OSDParser.DeserializeLLSDNotation(reply["home"].AsString());
if (osdHome.Type == OSDType.Map)
{
@@ -373,13 +373,13 @@ namespace OpenMetaverse
home["position"] = OSD.FromVector3(HomePosition);
home["look_at"] = OSD.FromVector3(HomeLookAt);
- WriteXmlRpcStringMember(writer, false, "home", LLSDParser.SerializeLLSDNotation(home));
+ WriteXmlRpcStringMember(writer, false, "home", OSDParser.SerializeLLSDNotation(home));
// message
WriteXmlRpcStringMember(writer, false, "message", Message);
// look_at
- WriteXmlRpcStringMember(writer, false, "look_at", LLSDParser.SerializeLLSDNotation(OSD.FromVector3(LookAt)));
+ WriteXmlRpcStringMember(writer, false, "look_at", OSDParser.SerializeLLSDNotation(OSD.FromVector3(LookAt)));
// login
WriteXmlRpcStringMember(writer, false, "login", "true");
@@ -461,7 +461,7 @@ namespace OpenMetaverse
}
else if (osd.Type == OSDType.String)
{
- OSDArray array = (OSDArray)LLSDParser.DeserializeLLSDNotation(osd.AsString());
+ OSDArray array = (OSDArray)OSDParser.DeserializeLLSDNotation(osd.AsString());
return array.AsVector3();
}
}
@@ -972,7 +972,7 @@ namespace OpenMetaverse
CapsClient loginRequest = new CapsClient(loginUri);
loginRequest.OnComplete += new CapsClient.CompleteCallback(LoginReplyHandler);
loginRequest.UserData = CurrentContext;
- loginRequest.StartRequest(LLSDParser.SerializeLLSDXmlBytes(loginLLSD), "application/xml+llsd");
+ loginRequest.StartRequest(OSDParser.SerializeLLSDXmlBytes(loginLLSD), "application/xml+llsd");
}
private void UpdateLoginStatus(LoginStatus status, string message)
diff --git a/OpenMetaverse/StructuredData/BinaryLLSD.cs b/OpenMetaverse/StructuredData/BinaryLLSD.cs
index a0fb80f3..b990c454 100644
--- a/OpenMetaverse/StructuredData/BinaryLLSD.cs
+++ b/OpenMetaverse/StructuredData/BinaryLLSD.cs
@@ -47,7 +47,7 @@ namespace OpenMetaverse.StructuredData
///
///
///
- public static partial class LLSDParser
+ public static partial class OSDParser
{
private const int initialBufferSize = 128;
private const int int32Length = 4;
diff --git a/OpenMetaverse/StructuredData/NotationLLSD.cs b/OpenMetaverse/StructuredData/NotationLLSD.cs
index 0d6a70b1..9779dbe4 100644
--- a/OpenMetaverse/StructuredData/NotationLLSD.cs
+++ b/OpenMetaverse/StructuredData/NotationLLSD.cs
@@ -34,7 +34,7 @@ namespace OpenMetaverse.StructuredData
///
///
///
- public static partial class LLSDParser
+ public static partial class OSDParser
{
private const string baseIndent = " ";
diff --git a/OpenMetaverse/StructuredData/StructuredData.cs b/OpenMetaverse/StructuredData/StructuredData.cs
index df973bc3..82688277 100644
--- a/OpenMetaverse/StructuredData/StructuredData.cs
+++ b/OpenMetaverse/StructuredData/StructuredData.cs
@@ -628,7 +628,7 @@ namespace OpenMetaverse.StructuredData
public override string ToString()
{
- return LLSDParser.SerializeLLSDNotationFormatted(this);
+ return OSDParser.SerializeLLSDNotationFormatted(this);
}
#region IDictionary Implementation
@@ -832,7 +832,7 @@ namespace OpenMetaverse.StructuredData
public override string ToString()
{
- return LLSDParser.SerializeLLSDNotationFormatted(this);
+ return OSDParser.SerializeLLSDNotationFormatted(this);
}
#region IList Implementation
diff --git a/OpenMetaverse/StructuredData/XmlLLSD.cs b/OpenMetaverse/StructuredData/XmlLLSD.cs
index 4709bcea..75057109 100644
--- a/OpenMetaverse/StructuredData/XmlLLSD.cs
+++ b/OpenMetaverse/StructuredData/XmlLLSD.cs
@@ -36,7 +36,7 @@ namespace OpenMetaverse.StructuredData
///
///
///
- public static partial class LLSDParser
+ public static partial class OSDParser
{
private static XmlSchema XmlSchema;
private static XmlTextReader XmlTextReader;
diff --git a/Programs/GridProxy/GridProxy.cs b/Programs/GridProxy/GridProxy.cs
index de5cf1ef..30a21c27 100644
--- a/Programs/GridProxy/GridProxy.cs
+++ b/Programs/GridProxy/GridProxy.cs
@@ -599,11 +599,11 @@ namespace GridProxy
if (cap.ReqFmt == CapsDataFormat.SD)
{
- capReq.Request = LLSDParser.DeserializeLLSDXml(content);
+ capReq.Request = OSDParser.DeserializeLLSDXml(content);
}
else
{
- capReq.Request = LLSDParser.DeserializeLLSDXml(content);
+ capReq.Request = OSDParser.DeserializeLLSDXml(content);
}
foreach (CapsDelegate d in cap.GetDelegates())
@@ -613,11 +613,11 @@ namespace GridProxy
if (cap.ReqFmt == CapsDataFormat.SD)
{
- content = LLSDParser.SerializeLLSDXmlBytes((OSD)capReq.Request);
+ content = OSDParser.SerializeLLSDXmlBytes((OSD)capReq.Request);
}
else
{
- content = LLSDParser.SerializeLLSDXmlBytes(capReq.Request);
+ content = OSDParser.SerializeLLSDXmlBytes(capReq.Request);
}
}
@@ -709,11 +709,11 @@ namespace GridProxy
{
if (cap.RespFmt == CapsDataFormat.SD)
{
- capReq.Response = LLSDParser.DeserializeLLSDXml(respBuf);
+ capReq.Response = OSDParser.DeserializeLLSDXml(respBuf);
}
else
{
- capReq.Response = LLSDParser.DeserializeLLSDXml(respBuf);
+ capReq.Response = OSDParser.DeserializeLLSDXml(respBuf);
}
}
@@ -760,11 +760,11 @@ namespace GridProxy
if (cap.RespFmt == CapsDataFormat.SD)
{
- respBuf = LLSDParser.SerializeLLSDXmlBytes((OSD)capReq.Response);
+ respBuf = OSDParser.SerializeLLSDXmlBytes((OSD)capReq.Response);
}
else
{
- respBuf = LLSDParser.SerializeLLSDXmlBytes(capReq.Response);
+ respBuf = OSDParser.SerializeLLSDXmlBytes(capReq.Response);
}
}
@@ -1105,7 +1105,7 @@ namespace GridProxy
writer.Write("HTTP/1.0 200 OK\r\n");
writer.Write("Content-type: application/xml+llsd\r\n");
writer.Write("\r\n");
- writer.Write(LLSDParser.SerializeLLSDXmlString(response));
+ writer.Write(OSDParser.SerializeLLSDXmlString(response));
writer.Close();
}
}
diff --git a/Programs/PrimWorkshop/frmBrowser.cs b/Programs/PrimWorkshop/frmBrowser.cs
index 2dfed9cf..65717a22 100644
--- a/Programs/PrimWorkshop/frmBrowser.cs
+++ b/Programs/PrimWorkshop/frmBrowser.cs
@@ -334,7 +334,7 @@ namespace PrimWorkshop
textures = 0;
// Write the LLSD to the hard drive in XML format
- string output = LLSDParser.SerializeLLSDXmlString(Helpers.PrimListToOSD(primList));
+ string output = OSDParser.SerializeLLSDXmlString(Helpers.PrimListToOSD(primList));
try
{
// Create a temporary directory
@@ -504,7 +504,7 @@ namespace PrimWorkshop
// Decode the .prims file
string raw = File.ReadAllText(primFile);
- OSD osd = LLSDParser.DeserializeLLSDXml(raw);
+ OSD osd = OSDParser.DeserializeLLSDXml(raw);
return Helpers.OSDToPrimList(osd);
}
catch (Exception e)
diff --git a/Programs/PrimWorkshop/frmPrimWorkshop.cs b/Programs/PrimWorkshop/frmPrimWorkshop.cs
index f50d1b80..cc324eb7 100644
--- a/Programs/PrimWorkshop/frmPrimWorkshop.cs
+++ b/Programs/PrimWorkshop/frmPrimWorkshop.cs
@@ -270,7 +270,7 @@ namespace PrimWorkshop
OSD osd = null;
- try { osd = LLSDParser.DeserializeLLSDXml(File.ReadAllText(primsFile)); }
+ try { osd = OSDParser.DeserializeLLSDXml(File.ReadAllText(primsFile)); }
catch (Exception ex) { MessageBox.Show(ex.Message); }
if (osd != null && osd.Type == OSDType.Map)
diff --git a/Programs/Simian/Extensions/XMLPersistence.cs b/Programs/Simian/Extensions/XMLPersistence.cs
index f4d2a735..092415d7 100644
--- a/Programs/Simian/Extensions/XMLPersistence.cs
+++ b/Programs/Simian/Extensions/XMLPersistence.cs
@@ -25,7 +25,7 @@ namespace Simian.Extensions
try
{
XmlTextReader reader = new XmlTextReader(File.OpenRead(server.DataDir + "simiandata.xml"));
- osd = LLSDParser.DeserializeLLSDXml(reader);
+ osd = OSDParser.DeserializeLLSDXml(reader);
reader.Close();
}
catch (FileNotFoundException)
@@ -77,7 +77,7 @@ namespace Simian.Extensions
XmlTextWriter writer = new XmlTextWriter(server.DataDir + "simiandata.xml", System.Text.Encoding.UTF8);
writer.Formatting = Formatting.Indented;
writer.WriteStartElement("llsd");
- LLSDParser.SerializeLLSDXmlElement(writer, dictionary);
+ OSDParser.SerializeLLSDXmlElement(writer, dictionary);
writer.WriteEndElement();
writer.Close();
}
diff --git a/Programs/examples/TestClient/Commands/Prims/ExportCommand.cs b/Programs/examples/TestClient/Commands/Prims/ExportCommand.cs
index 06571c1b..b166d3ca 100644
--- a/Programs/examples/TestClient/Commands/Prims/ExportCommand.cs
+++ b/Programs/examples/TestClient/Commands/Prims/ExportCommand.cs
@@ -100,7 +100,7 @@ namespace OpenMetaverse.TestClient
Logger.Log(uuid.ToString(), Helpers.LogLevel.Warning, Client);
}
- string output = LLSDParser.SerializeLLSDXmlString(Helpers.PrimListToOSD(prims));
+ string output = OSDParser.SerializeLLSDXmlString(Helpers.PrimListToOSD(prims));
try { File.WriteAllText(file, output); }
catch (Exception e) { return e.Message; }
diff --git a/Programs/examples/TestClient/Commands/Prims/ImportCommand.cs b/Programs/examples/TestClient/Commands/Prims/ImportCommand.cs
index a460750a..5c2755f4 100644
--- a/Programs/examples/TestClient/Commands/Prims/ImportCommand.cs
+++ b/Programs/examples/TestClient/Commands/Prims/ImportCommand.cs
@@ -63,7 +63,7 @@ namespace OpenMetaverse.TestClient
try { xml = File.ReadAllText(filename); }
catch (Exception e) { return e.Message; }
- try { prims = Helpers.OSDToPrimList(LLSDParser.DeserializeLLSDXml(xml)); }
+ try { prims = Helpers.OSDToPrimList(OSDParser.DeserializeLLSDXml(xml)); }
catch (Exception e) { return "Failed to deserialize " + filename + ": " + e.Message; }
// Build an organized structure from the imported prims