From 0b32cf0e8f0e1467ca149a26cbe8f17a006b27de Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Wed, 22 Jun 2016 06:21:23 -0700 Subject: [PATCH] Can't do it do it this low in the stack. Attachments on teleports apparently rely on State being != 0. Revert "Mantis #7932: Some objects were being serialized with PCode=9 and State != 0 (meaning attachments). That should never happen." This reverts commit f19199cf4a6ef9cdcfbdbff3a1f604f595216f65. --- .../Scenes/Serialization/SceneObjectSerializer.cs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index 795da3f3f4..7d3a168f03 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 writer.WriteElementString("ProfileBegin", shp.ProfileBegin.ToString()); writer.WriteElementString("ProfileEnd", shp.ProfileEnd.ToString()); writer.WriteElementString("ProfileHollow", shp.ProfileHollow.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("State", shp.State.ToString()); writer.WriteElementString("LastAttachPoint", shp.LastAttachPoint.ToString()); WriteFlags(writer, "ProfileShape", shp.ProfileShape.ToString(), options); @@ -1800,10 +1799,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization reader.ReadEndElement(); // Shape - if (shape.PCode == (byte)PCodeEnum.Primitive && shape.State != 0) - // This should not happen! - shape.State = 0; - errorNodeNames = internalErrorNodeNames; return shape;