Merge branch 'master' into mantis5110

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
--- a/bin/OpenMetaverse.Rendering.Meshmerizer.dll
+++ b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
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 @@
         </member>
         <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.Byte[])">
             <summary>
-            
+            Deserializes binary LLSD
             </summary>
-            <param name="binaryData"></param>
-            <returns></returns>
+            <param name="binaryData">Serialized data</param>
+            <returns>OSD containting deserialized data</returns>
         </member>
         <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.IO.Stream)">
             <summary>
-            
+            Deserializes binary LLSD
             </summary>
-            <param name="stream"></param>
-            <returns></returns>
+            <param name="stream">Stream to read the data from</param>
+            <returns>OSD containting deserialized data</returns>
         </member>
         <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDBinary(OpenMetaverse.StructuredData.OSD)">
             <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
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 @@
             <param name="targetID">target avatars <seealso cref="T:OpenMetaverse.UUID"/> to lure</param>
             <param name="message">custom message to send with invitation</param>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.TeleportLureRespond(OpenMetaverse.UUID,System.Boolean)">
+        <member name="M:OpenMetaverse.AgentManager.TeleportLureRespond(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean)">
             <summary>
             Respond to a teleport lure by either accepting it and initiating 
             the teleport, or denying it
             </summary>
             <param name="requesterID"><seealso cref="T:OpenMetaverse.UUID"/> of the avatar sending the lure</param>
+            <param name="sessionID">IM session <seealso cref="T:OpenMetaverse.UUID"/> of the incoming lure request</param>
             <param name="accept">true to accept the lure, false to decline it</param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.UpdateProfile(OpenMetaverse.Avatar.AvatarProperties)">
@@ -19866,9 +19867,6 @@
         <member name="F:OpenMetaverse.AppearanceManager.WEARABLES_PER_LAYER">
             <summary>Total number of wearables per bake layer</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.AVATAR_TEXTURE_COUNT">
-            <summary>Total number of textures on an avatar, baked or not</summary>
-        </member>
         <member name="F:OpenMetaverse.AppearanceManager.BakeIndexToTextureIndex">
             <summary>Mapping between BakeType and AvatarTextureIndex</summary>
         </member>
@@ -20315,6 +20313,9 @@
         <member name="F:OpenMetaverse.AppearanceManager.TextureData.Color">
             <summary>Tint that should be applied to the texture</summary>
         </member>
+        <member name="F:OpenMetaverse.AppearanceManager.TextureData.TextureIndex">
+            <summary>Where on avatar does this texture belong</summary>
+        </member>
         <member name="T:OpenMetaverse.AgentWearablesReplyEventArgs">
             <summary>Contains the Event data returned from the data server from an AgentWearablesRequest</summary>
         </member>
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index a07d64f..f5952b4 100644
--- a/bin/OpenMetaverse.dll
+++ b/bin/OpenMetaverse.dll
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index 2d7a372..f4f701b 100644
--- a/bin/OpenMetaverseTypes.dll
+++ b/bin/OpenMetaverseTypes.dll