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 57ae4fd..b2b3ad9 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 | } |
@@ -220,7 +220,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
220 | if (originalLinkNum != 0) | 220 | if (originalLinkNum != 0) |
221 | part.LinkNum = originalLinkNum; | 221 | part.LinkNum = originalLinkNum; |
222 | 222 | ||
223 | part.StoreUndoState(); | 223 | part.StoreUndoState(UndoType.STATE_ALL); |
224 | reader.Close(); | 224 | reader.Close(); |
225 | sr.Close(); | 225 | sr.Close(); |
226 | } | 226 | } |
@@ -1441,12 +1441,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1441 | { | 1441 | { |
1442 | TaskInventoryDictionary tinv = new TaskInventoryDictionary(); | 1442 | TaskInventoryDictionary tinv = new TaskInventoryDictionary(); |
1443 | 1443 | ||
1444 | if (reader.IsEmptyElement) | ||
1445 | { | ||
1446 | reader.Read(); | ||
1447 | return tinv; | ||
1448 | } | ||
1449 | |||
1450 | reader.ReadStartElement(name, String.Empty); | 1444 | reader.ReadStartElement(name, String.Empty); |
1451 | 1445 | ||
1452 | while (reader.Name == "TaskInventoryItem") | 1446 | while (reader.Name == "TaskInventoryItem") |
@@ -1480,12 +1474,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1480 | { | 1474 | { |
1481 | PrimitiveBaseShape shape = new PrimitiveBaseShape(); | 1475 | PrimitiveBaseShape shape = new PrimitiveBaseShape(); |
1482 | 1476 | ||
1483 | if (reader.IsEmptyElement) | ||
1484 | { | ||
1485 | reader.Read(); | ||
1486 | return shape; | ||
1487 | } | ||
1488 | |||
1489 | reader.ReadStartElement(name, String.Empty); // Shape | 1477 | reader.ReadStartElement(name, String.Empty); // Shape |
1490 | 1478 | ||
1491 | string nodeName = string.Empty; | 1479 | string nodeName = string.Empty; |