diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index 872816c..c42302f 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
@@ -102,7 +102,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
102 | sceneObject.AddPart(part); | 102 | sceneObject.AddPart(part); |
103 | part.LinkNum = linkNum; | 103 | part.LinkNum = linkNum; |
104 | part.TrimPermissions(); | 104 | part.TrimPermissions(); |
105 | part.StoreUndoState(); | 105 | part.StoreUndoState(UndoType.STATE_ALL); |
106 | reader.Close(); | 106 | reader.Close(); |
107 | sr.Close(); | 107 | sr.Close(); |
108 | } | 108 | } |
@@ -237,7 +237,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
237 | if (originalLinkNum != 0) | 237 | if (originalLinkNum != 0) |
238 | part.LinkNum = originalLinkNum; | 238 | part.LinkNum = originalLinkNum; |
239 | 239 | ||
240 | part.StoreUndoState(); | 240 | part.StoreUndoState(UndoType.STATE_ALL); |
241 | reader.Close(); | 241 | reader.Close(); |
242 | sr.Close(); | 242 | sr.Close(); |
243 | } | 243 | } |
@@ -1493,12 +1493,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1493 | { | 1493 | { |
1494 | TaskInventoryDictionary tinv = new TaskInventoryDictionary(); | 1494 | TaskInventoryDictionary tinv = new TaskInventoryDictionary(); |
1495 | 1495 | ||
1496 | if (reader.IsEmptyElement) | ||
1497 | { | ||
1498 | reader.Read(); | ||
1499 | return tinv; | ||
1500 | } | ||
1501 | |||
1502 | reader.ReadStartElement(name, String.Empty); | 1496 | reader.ReadStartElement(name, String.Empty); |
1503 | 1497 | ||
1504 | while (reader.Name == "TaskInventoryItem") | 1498 | while (reader.Name == "TaskInventoryItem") |
@@ -1532,12 +1526,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1532 | { | 1526 | { |
1533 | PrimitiveBaseShape shape = new PrimitiveBaseShape(); | 1527 | PrimitiveBaseShape shape = new PrimitiveBaseShape(); |
1534 | 1528 | ||
1535 | if (reader.IsEmptyElement) | ||
1536 | { | ||
1537 | reader.Read(); | ||
1538 | return shape; | ||
1539 | } | ||
1540 | |||
1541 | reader.ReadStartElement(name, String.Empty); // Shape | 1529 | reader.ReadStartElement(name, String.Empty); // Shape |
1542 | 1530 | ||
1543 | string nodeName = string.Empty; | 1531 | string nodeName = string.Empty; |