aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2011-01-08 15:49:51 -0800
committerDiva Canto2011-01-08 15:49:51 -0800
commiteab0951a591bc2576d6b361a6fa4c75f683bfa54 (patch)
treefc80030688dc9088779f14b1d39fb9bb9b6c6ca6
parentTry to fix a IAR problem reported by nebadon, where save iar seems stuck fore... (diff)
downloadopensim-SC_OLD-eab0951a591bc2576d6b361a6fa4c75f683bfa54.zip
opensim-SC_OLD-eab0951a591bc2576d6b361a6fa4c75f683bfa54.tar.gz
opensim-SC_OLD-eab0951a591bc2576d6b361a6fa4c75f683bfa54.tar.bz2
opensim-SC_OLD-eab0951a591bc2576d6b361a6fa4c75f683bfa54.tar.xz
Fixes the issue of hung archives. Problem was with SceneObjectSerializer.
Also fixes a buglet in scene load xml command, where it was given the wrong argument index for filename.
-rw-r--r--OpenSim/Region/Application/OpenSim.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs12
2 files changed, 13 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index e3b8573..51eb396 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -1146,7 +1146,7 @@ namespace OpenSim
1146 MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z)); 1146 MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z));
1147 } 1147 }
1148 } 1148 }
1149 m_sceneManager.LoadCurrentSceneFromXml(cmdparams[0], generateNewIDS, loadOffset); 1149 m_sceneManager.LoadCurrentSceneFromXml(cmdparams[2], generateNewIDS, loadOffset);
1150 } 1150 }
1151 else 1151 else
1152 { 1152 {
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 605521a..57ae4fd 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -1441,6 +1441,12 @@ 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
1444 reader.ReadStartElement(name, String.Empty); 1450 reader.ReadStartElement(name, String.Empty);
1445 1451
1446 while (reader.Name == "TaskInventoryItem") 1452 while (reader.Name == "TaskInventoryItem")
@@ -1474,6 +1480,12 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1474 { 1480 {
1475 PrimitiveBaseShape shape = new PrimitiveBaseShape(); 1481 PrimitiveBaseShape shape = new PrimitiveBaseShape();
1476 1482
1483 if (reader.IsEmptyElement)
1484 {
1485 reader.Read();
1486 return shape;
1487 }
1488
1477 reader.ReadStartElement(name, String.Empty); // Shape 1489 reader.ReadStartElement(name, String.Empty); // Shape
1478 1490
1479 string nodeName = string.Empty; 1491 string nodeName = string.Empty;