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

Mantis #7932: Some objects were being serialized with PCode=9 and State != 0 (meaning attachments). That should never happen.

LSLKeyTest
Diva Canto 2016-06-21 20:28:25 -07:00
parent 34b308d5b6
commit f19199cf4a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1671,7 +1671,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
writer.WriteElementString("ProfileBegin", shp.ProfileBegin.ToString()); writer.WriteElementString("ProfileBegin", shp.ProfileBegin.ToString());
writer.WriteElementString("ProfileEnd", shp.ProfileEnd.ToString()); writer.WriteElementString("ProfileEnd", shp.ProfileEnd.ToString());
writer.WriteElementString("ProfileHollow", shp.ProfileHollow.ToString()); writer.WriteElementString("ProfileHollow", shp.ProfileHollow.ToString());
writer.WriteElementString("State", shp.State.ToString()); // There's no such thing as a primitive with state != 0 (attachment)
writer.WriteElementString("State", (shp.PCode == (byte)PCodeEnum.Primitive ? "0" : shp.State.ToString()));
writer.WriteElementString("LastAttachPoint", shp.LastAttachPoint.ToString()); writer.WriteElementString("LastAttachPoint", shp.LastAttachPoint.ToString());
WriteFlags(writer, "ProfileShape", shp.ProfileShape.ToString(), options); WriteFlags(writer, "ProfileShape", shp.ProfileShape.ToString(), options);
@ -1799,6 +1800,10 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
reader.ReadEndElement(); // Shape reader.ReadEndElement(); // Shape
if (shape.PCode == (byte)PCodeEnum.Primitive && shape.State != 0)
// This should not happen!
shape.State = 0;
errorNodeNames = internalErrorNodeNames; errorNodeNames = internalErrorNodeNames;
return shape; return shape;