Merge branch 'master' of /var/git/opensim/

1 files changed, 4 insertions, 1 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 7f37878..fb4ef28 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -735,7 +735,10 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
 
         private static void ProcessTIOldItemID(TaskInventoryItem item, XmlTextReader reader)
         {
-            item.OldItemID = ReadUUID(reader, "OldItemID");
+            ReadUUID(reader, "OldItemID");
+            // On deserialization, the old item id MUST BE UUID.Zero!!!!!
+            // Setting this to the saved value will BREAK script persistence!
+            // item.OldItemID = ReadUUID(reader, "OldItemID");
         }
 
         private static void ProcessTILastOwnerID(TaskInventoryItem item, XmlTextReader reader)