diff options
author | Diva Canto | 2016-06-22 06:21:23 -0700 |
---|---|---|
committer | Diva Canto | 2016-06-22 06:21:23 -0700 |
commit | 0b32cf0e8f0e1467ca149a26cbe8f17a006b27de (patch) | |
tree | 14e94741359bf1798f5f73f6daf7c0d5f40aeff5 /OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-0b32cf0e8f0e1467ca149a26cbe8f17a006b27de.zip opensim-SC_OLD-0b32cf0e8f0e1467ca149a26cbe8f17a006b27de.tar.gz opensim-SC_OLD-0b32cf0e8f0e1467ca149a26cbe8f17a006b27de.tar.bz2 opensim-SC_OLD-0b32cf0e8f0e1467ca149a26cbe8f17a006b27de.tar.xz |
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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 7 |
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; |