diff options
| author | Justin Clark-Casey (justincc) | 2010-11-16 19:18:43 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-11-16 19:18:43 +0000 |
| commit | c5d78c723b0965b196ba22224e4bf56696ea96f5 (patch) | |
| tree | d47ff745be7d74a43d322ad3884fddea7d03732b /OpenSim/Region/Framework | |
| parent | Do not include hyperlinks in a random region search during a login. (diff) | |
| parent | Fix osTeleportAgent for hypergrid destinations. (diff) | |
| download | opensim-SC-c5d78c723b0965b196ba22224e4bf56696ea96f5.zip opensim-SC-c5d78c723b0965b196ba22224e4bf56696ea96f5.tar.gz opensim-SC-c5d78c723b0965b196ba22224e4bf56696ea96f5.tar.bz2 opensim-SC-c5d78c723b0965b196ba22224e4bf56696ea96f5.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 5 |
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 | |||
| 735 | 735 | ||
| 736 | private static void ProcessTIOldItemID(TaskInventoryItem item, XmlTextReader reader) | 736 | private static void ProcessTIOldItemID(TaskInventoryItem item, XmlTextReader reader) |
| 737 | { | 737 | { |
| 738 | item.OldItemID = ReadUUID(reader, "OldItemID"); | 738 | ReadUUID(reader, "OldItemID"); |
| 739 | // On deserialization, the old item id MUST BE UUID.Zero!!!!! | ||
| 740 | // Setting this to the saved value will BREAK script persistence! | ||
| 741 | // item.OldItemID = ReadUUID(reader, "OldItemID"); | ||
| 739 | } | 742 | } |
| 740 | 743 | ||
| 741 | private static void ProcessTILastOwnerID(TaskInventoryItem item, XmlTextReader reader) | 744 | private static void ProcessTILastOwnerID(TaskInventoryItem item, XmlTextReader reader) |