aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs7
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 795da3f..7d3a168 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -1671,8 +1671,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1671 writer.WriteElementString("ProfileBegin", shp.ProfileBegin.ToString()); 1671 writer.WriteElementString("ProfileBegin", shp.ProfileBegin.ToString());
1672 writer.WriteElementString("ProfileEnd", shp.ProfileEnd.ToString()); 1672 writer.WriteElementString("ProfileEnd", shp.ProfileEnd.ToString());
1673 writer.WriteElementString("ProfileHollow", shp.ProfileHollow.ToString()); 1673 writer.WriteElementString("ProfileHollow", shp.ProfileHollow.ToString());
1674 // There's no such thing as a primitive with state != 0 (attachment) 1674 writer.WriteElementString("State", shp.State.ToString());
1675 writer.WriteElementString("State", (shp.PCode == (byte)PCodeEnum.Primitive ? "0" : shp.State.ToString()));
1676 writer.WriteElementString("LastAttachPoint", shp.LastAttachPoint.ToString()); 1675 writer.WriteElementString("LastAttachPoint", shp.LastAttachPoint.ToString());
1677 1676
1678 WriteFlags(writer, "ProfileShape", shp.ProfileShape.ToString(), options); 1677 WriteFlags(writer, "ProfileShape", shp.ProfileShape.ToString(), options);
@@ -1800,10 +1799,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1800 1799
1801 reader.ReadEndElement(); // Shape 1800 reader.ReadEndElement(); // Shape
1802 1801
1803 if (shape.PCode == (byte)PCodeEnum.Primitive && shape.State != 0)
1804 // This should not happen!
1805 shape.State = 0;
1806
1807 errorNodeNames = internalErrorNodeNames; 1802 errorNodeNames = internalErrorNodeNames;
1808 1803
1809 return shape; 1804 return shape;