From c74c1620a15fcf032a074ed2b979a06f2913e08b Mon Sep 17 00:00:00 2001
From: Latif Khalifa
Date: Sun, 24 Oct 2010 22:47:53 +0200
Subject: * Updated libomv to r3461 Main reason for upgrade is to revert API
change that was introduced in order to support headerless binary LLSD
decoding needed for deserialization of the mesh assets, which turned out to
be unnecessary as we can transparently decode both kinds.
---
OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 4 ++--
bin/OpenMetaverse.Rendering.Meshmerizer.dll | Bin 20480 -> 20480 bytes
bin/OpenMetaverse.StructuredData.XML | 12 ++++++------
bin/OpenMetaverse.StructuredData.dll | Bin 102400 -> 102400 bytes
bin/OpenMetaverse.XML | 9 +++++----
bin/OpenMetaverse.dll | Bin 1716224 -> 1716224 bytes
bin/OpenMetaverseTypes.dll | Bin 114688 -> 114688 bytes
7 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 1257804..d770ad1 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -287,7 +287,7 @@ namespace OpenSim.Region.Physics.Meshing
long start = 0;
using (MemoryStream data = new MemoryStream(primShape.SculptData))
{
- meshOsd = (OSDMap)OSDParser.DeserializeLLSDBinary(data, true);
+ meshOsd = (OSDMap)OSDParser.DeserializeLLSDBinary(data);
start = data.Position;
}
@@ -324,7 +324,7 @@ namespace OpenSim.Region.Physics.Meshing
byte[] decompressedBuf = outMs.GetBuffer();
- decodedMeshOsd = OSDParser.DeserializeLLSDBinary(decompressedBuf, true);
+ decodedMeshOsd = OSDParser.DeserializeLLSDBinary(decompressedBuf);
}
}
}
diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
index 0160d21..f89ac5a 100755
Binary files a/bin/OpenMetaverse.Rendering.Meshmerizer.dll and b/bin/OpenMetaverse.Rendering.Meshmerizer.dll differ
diff --git a/bin/OpenMetaverse.StructuredData.XML b/bin/OpenMetaverse.StructuredData.XML
index 2a0426c..f5842c8 100644
--- a/bin/OpenMetaverse.StructuredData.XML
+++ b/bin/OpenMetaverse.StructuredData.XML
@@ -135,17 +135,17 @@
-
+ Deserializes binary LLSD
-
-
+ Serialized data
+ OSD containting deserialized data
-
+ Deserializes binary LLSD
-
-
+ Stream to read the data from
+ OSD containting deserialized data
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll
index c1e54fa..33b19ca 100644
Binary files a/bin/OpenMetaverse.StructuredData.dll and b/bin/OpenMetaverse.StructuredData.dll differ
diff --git a/bin/OpenMetaverse.XML b/bin/OpenMetaverse.XML
index 56f0c87..f5bda4b 100644
--- a/bin/OpenMetaverse.XML
+++ b/bin/OpenMetaverse.XML
@@ -10318,12 +10318,13 @@
target avatars to lure
custom message to send with invitation
-
+
Respond to a teleport lure by either accepting it and initiating
the teleport, or denying it
of the avatar sending the lure
+ IM session of the incoming lure request
true to accept the lure, false to decline it
@@ -19866,9 +19867,6 @@
Total number of wearables per bake layer
-
- Total number of textures on an avatar, baked or not
-
Mapping between BakeType and AvatarTextureIndex
@@ -20315,6 +20313,9 @@
Tint that should be applied to the texture
+
+ Where on avatar does this texture belong
+
Contains the Event data returned from the data server from an AgentWearablesRequest
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index a07d64f..f5952b4 100644
Binary files a/bin/OpenMetaverse.dll and b/bin/OpenMetaverse.dll differ
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index 2d7a372..f4f701b 100644
Binary files a/bin/OpenMetaverseTypes.dll and b/bin/OpenMetaverseTypes.dll differ
--
cgit v1.1