ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Remove a bug I created in r5171 where taking an object would terminate the client session

Browse Source 
* change code to use an explicit state variable instead of using SOG.Name = null to signal deletion
This commit is contained in:
Justin Clarke Casey
2008-06-21 19:56:19 +00:00
parent ff56cb730b
commit b290ce405f
6 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
View File

@@ -31,6 +31,7 @@ using OpenSim.Region.Environment.Modules.World.Serialiser;
using System;
using System.IO;
using System.Reflection;
using System.Xml;
using libsecondlife;
using log4net;
@@ -101,6 +102,20 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
m_log.InfoFormat("[ARCHIVER]: Loading prim data");
IRegionSerialiser serialiser = m_scene.RequestModuleInterface<IRegionSerialiser>();
// Temporary code to read each sog in the file separately, pending actually having these in separate files
// XmlTextReader xtr = new XmlTextReader(new StringReader(serializedPrims));
// XmlDocument doc = new XmlDocument();
// reader.WhitespaceHandling = WhitespaceHandling.None;
// doc.Load(xtr);
// xtr.Close();
// XmlNode sceneNode = doc.FirstChild;
//
// foreach (XmlNode objectNode in sceneNode.ChildNodes)
// {
// CreatePrimFromXml2(m_scene, objectNode.OuterXml);
// }
serialiser.LoadPrimsFromXml2(m_scene, new StringReader(serializedPrims));
}
}

1
OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
View File

@@ -114,6 +114,7 @@ namespace OpenSim.Region.Environment.Scenes
doc.Load(reader);
reader.Close();
rootNode = doc.FirstChild;
foreach (XmlNode aPrimNode in rootNode.ChildNodes)
{
CreatePrimFromXml2(scene, aPrimNode.OuterXml);