OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster-presence-refactor

avinationmerge
Melanie 2010-10-25 01:24:30 +01:00
parent 61137eac22 c74c1620a1
commit ac370cf57b
8 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
View File

@ -1426,7 +1426,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
reader.ReadStartElement(name);
vec.X = reader.ReadElementContentAsFloat(reader.Name, String.Empty); // X or x
vec.Y = reader.ReadElementContentAsFloat(reader.Name, String.Empty); // Y or Y
vec.Y = reader.ReadElementContentAsFloat(reader.Name, String.Empty); // Y or y
vec.Z = reader.ReadElementContentAsFloat(reader.Name, String.Empty); // Z or z
reader.ReadEndElement();
@ -1501,15 +1501,28 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
reader.ReadStartElement(name, String.Empty); // Shape
string nodeName = string.Empty;
while (reader.NodeType != XmlNodeType.EndElement)
{
nodeName = reader.Name;
//m_log.DebugFormat("[XXX] Processing: {0}", reader.Name);
ShapeXmlProcessor p = null;
if (m_ShapeXmlProcessors.TryGetValue(reader.Name, out p))
{
try
{
p(shape, reader);
}
catch (Exception e)
{
m_log.DebugFormat("[SceneObjectSerializer]: exception while parsing Shape {0}: {1}", nodeName, e);
if (reader.NodeType == XmlNodeType.EndElement)
reader.Read();
}
}
else
{
// m_log.DebugFormat("[SceneObjectSerializer]: caught unknown element in Shape {0}", reader.Name);
// m_log.DebugFormat("[SceneObjectSerializer]: caught unknown element in Shape {0}", reader.Name);
reader.ReadOuterXml();
}
}

4
OpenSim/Region/Physics/Meshing/Meshmerizer.cs
View File

@ -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);
}
}
}

BIN
bin/OpenMetaverse.Rendering.Meshmerizer.dll
View File

Binary file not shown.

12
bin/OpenMetaverse.StructuredData.XML
View File

@ -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>

BIN
bin/OpenMetaverse.StructuredData.dll
View File

Binary file not shown.

9
bin/OpenMetaverse.XML
View File

@ -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>

BIN
bin/OpenMetaverse.dll
View File

Binary file not shown.

BIN
bin/OpenMetaverseTypes.dll
View File

Binary file not shown.