aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Serialization
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization')
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs16
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 bb8a83a..769d8a5 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 }
@@ -1458,12 +1458,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1458 { 1458 {
1459 TaskInventoryDictionary tinv = new TaskInventoryDictionary(); 1459 TaskInventoryDictionary tinv = new TaskInventoryDictionary();
1460 1460
1461 if (reader.IsEmptyElement)
1462 {
1463 reader.Read();
1464 return tinv;
1465 }
1466
1467 reader.ReadStartElement(name, String.Empty); 1461 reader.ReadStartElement(name, String.Empty);
1468 1462
1469 while (reader.Name == "TaskInventoryItem") 1463 while (reader.Name == "TaskInventoryItem")
@@ -1497,12 +1491,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1497 { 1491 {
1498 PrimitiveBaseShape shape = new PrimitiveBaseShape(); 1492 PrimitiveBaseShape shape = new PrimitiveBaseShape();
1499 1493
1500 if (reader.IsEmptyElement)
1501 {
1502 reader.Read();
1503 return shape;
1504 }
1505
1506 reader.ReadStartElement(name, String.Empty); // Shape 1494 reader.ReadStartElement(name, String.Empty); // Shape
1507 1495
1508 string nodeName = string.Empty; 1496 string nodeName = string.Empty;