aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorLatif Khalifa2010-10-24 22:47:53 +0200
committerMelanie2010-10-24 23:51:46 +0100
commitc74c1620a15fcf032a074ed2b979a06f2913e08b (patch)
tree570f90a54a035a1cebd160a66369d53d12935053
parentAdd PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCAL (diff)
downloadopensim-SC_OLD-c74c1620a15fcf032a074ed2b979a06f2913e08b.zip
opensim-SC_OLD-c74c1620a15fcf032a074ed2b979a06f2913e08b.tar.gz
opensim-SC_OLD-c74c1620a15fcf032a074ed2b979a06f2913e08b.tar.bz2
opensim-SC_OLD-c74c1620a15fcf032a074ed2b979a06f2913e08b.tar.xz
* 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.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs4
-rwxr-xr-xbin/OpenMetaverse.Rendering.Meshmerizer.dllbin20480 -> 20480 bytes
-rw-r--r--bin/OpenMetaverse.StructuredData.XML12
-rw-r--r--bin/OpenMetaverse.StructuredData.dllbin102400 -> 102400 bytes
-rw-r--r--bin/OpenMetaverse.XML9
-rw-r--r--bin/OpenMetaverse.dllbin1716224 -> 1716224 bytes
-rw-r--r--bin/OpenMetaverseTypes.dllbin114688 -> 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
287 long start = 0; 287 long start = 0;
288 using (MemoryStream data = new MemoryStream(primShape.SculptData)) 288 using (MemoryStream data = new MemoryStream(primShape.SculptData))
289 { 289 {
290 meshOsd = (OSDMap)OSDParser.DeserializeLLSDBinary(data, true); 290 meshOsd = (OSDMap)OSDParser.DeserializeLLSDBinary(data);
291 start = data.Position; 291 start = data.Position;
292 } 292 }
293 293
@@ -324,7 +324,7 @@ namespace OpenSim.Region.Physics.Meshing
324 324
325 byte[] decompressedBuf = outMs.GetBuffer(); 325 byte[] decompressedBuf = outMs.GetBuffer();
326 326
327 decodedMeshOsd = OSDParser.DeserializeLLSDBinary(decompressedBuf, true); 327 decodedMeshOsd = OSDParser.DeserializeLLSDBinary(decompressedBuf);
328 } 328 }
329 } 329 }
330 } 330 }
diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
index 0160d21..f89ac5a 100755
--- a/bin/OpenMetaverse.Rendering.Meshmerizer.dll
+++ b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
Binary files 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 @@
135 </member> 135 </member>
136 <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.Byte[])"> 136 <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.Byte[])">
137 <summary> 137 <summary>
138 138 Deserializes binary LLSD
139 </summary> 139 </summary>
140 <param name="binaryData"></param> 140 <param name="binaryData">Serialized data</param>
141 <returns></returns> 141 <returns>OSD containting deserialized data</returns>
142 </member> 142 </member>
143 <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.IO.Stream)"> 143 <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.IO.Stream)">
144 <summary> 144 <summary>
145 145 Deserializes binary LLSD
146 </summary> 146 </summary>
147 <param name="stream"></param> 147 <param name="stream">Stream to read the data from</param>
148 <returns></returns> 148 <returns>OSD containting deserialized data</returns>
149 </member> 149 </member>
150 <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDBinary(OpenMetaverse.StructuredData.OSD)"> 150 <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDBinary(OpenMetaverse.StructuredData.OSD)">
151 <summary> 151 <summary>
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll
index c1e54fa..33b19ca 100644
--- a/bin/OpenMetaverse.StructuredData.dll
+++ b/bin/OpenMetaverse.StructuredData.dll
Binary files 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 @@
10318 <param name="targetID">target avatars <seealso cref="T:OpenMetaverse.UUID"/> to lure</param> 10318 <param name="targetID">target avatars <seealso cref="T:OpenMetaverse.UUID"/> to lure</param>
10319 <param name="message">custom message to send with invitation</param> 10319 <param name="message">custom message to send with invitation</param>
10320 </member> 10320 </member>
10321 <member name="M:OpenMetaverse.AgentManager.TeleportLureRespond(OpenMetaverse.UUID,System.Boolean)"> 10321 <member name="M:OpenMetaverse.AgentManager.TeleportLureRespond(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean)">
10322 <summary> 10322 <summary>
10323 Respond to a teleport lure by either accepting it and initiating 10323 Respond to a teleport lure by either accepting it and initiating
10324 the teleport, or denying it 10324 the teleport, or denying it
10325 </summary> 10325 </summary>
10326 <param name="requesterID"><seealso cref="T:OpenMetaverse.UUID"/> of the avatar sending the lure</param> 10326 <param name="requesterID"><seealso cref="T:OpenMetaverse.UUID"/> of the avatar sending the lure</param>
10327 <param name="sessionID">IM session <seealso cref="T:OpenMetaverse.UUID"/> of the incoming lure request</param>
10327 <param name="accept">true to accept the lure, false to decline it</param> 10328 <param name="accept">true to accept the lure, false to decline it</param>
10328 </member> 10329 </member>
10329 <member name="M:OpenMetaverse.AgentManager.UpdateProfile(OpenMetaverse.Avatar.AvatarProperties)"> 10330 <member name="M:OpenMetaverse.AgentManager.UpdateProfile(OpenMetaverse.Avatar.AvatarProperties)">
@@ -19866,9 +19867,6 @@
19866 <member name="F:OpenMetaverse.AppearanceManager.WEARABLES_PER_LAYER"> 19867 <member name="F:OpenMetaverse.AppearanceManager.WEARABLES_PER_LAYER">
19867 <summary>Total number of wearables per bake layer</summary> 19868 <summary>Total number of wearables per bake layer</summary>
19868 </member> 19869 </member>
19869 <member name="F:OpenMetaverse.AppearanceManager.AVATAR_TEXTURE_COUNT">
19870 <summary>Total number of textures on an avatar, baked or not</summary>
19871 </member>
19872 <member name="F:OpenMetaverse.AppearanceManager.BakeIndexToTextureIndex"> 19870 <member name="F:OpenMetaverse.AppearanceManager.BakeIndexToTextureIndex">
19873 <summary>Mapping between BakeType and AvatarTextureIndex</summary> 19871 <summary>Mapping between BakeType and AvatarTextureIndex</summary>
19874 </member> 19872 </member>
@@ -20315,6 +20313,9 @@
20315 <member name="F:OpenMetaverse.AppearanceManager.TextureData.Color"> 20313 <member name="F:OpenMetaverse.AppearanceManager.TextureData.Color">
20316 <summary>Tint that should be applied to the texture</summary> 20314 <summary>Tint that should be applied to the texture</summary>
20317 </member> 20315 </member>
20316 <member name="F:OpenMetaverse.AppearanceManager.TextureData.TextureIndex">
20317 <summary>Where on avatar does this texture belong</summary>
20318 </member>
20318 <member name="T:OpenMetaverse.AgentWearablesReplyEventArgs"> 20319 <member name="T:OpenMetaverse.AgentWearablesReplyEventArgs">
20319 <summary>Contains the Event data returned from the data server from an AgentWearablesRequest</summary> 20320 <summary>Contains the Event data returned from the data server from an AgentWearablesRequest</summary>
20320 </member> 20321 </member>
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index a07d64f..f5952b4 100644
--- a/bin/OpenMetaverse.dll
+++ b/bin/OpenMetaverse.dll
Binary files differ
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index 2d7a372..f4f701b 100644
--- a/bin/OpenMetaverseTypes.dll
+++ b/bin/OpenMetaverseTypes.dll
Binary files differ