diff options
| author | Justin Clarke Casey | 2008-06-21 19:56:19 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2008-06-21 19:56:19 +0000 |
| commit | b290ce405f01ae4b52ba5d5ec1661a2ae44ba2d6 (patch) | |
| tree | bbc2b33cc84ba305709e325e580d64a5e07798ff /OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs | |
| parent | * minor: start saving current prims xml to an objects/ directory in the archive (diff) | |
| download | opensim-SC_OLD-b290ce405f01ae4b52ba5d5ec1661a2ae44ba2d6.zip opensim-SC_OLD-b290ce405f01ae4b52ba5d5ec1661a2ae44ba2d6.tar.gz opensim-SC_OLD-b290ce405f01ae4b52ba5d5ec1661a2ae44ba2d6.tar.bz2 opensim-SC_OLD-b290ce405f01ae4b52ba5d5ec1661a2ae44ba2d6.tar.xz | |
* Remove a bug I created in r5171 where taking an object would terminate the client session
* change code to use an explicit state variable instead of using SOG.Name = null to signal deletion
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs')
| -rw-r--r-- | OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs index db16601..94161f0 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs +++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs | |||
| @@ -114,6 +114,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 114 | doc.Load(reader); | 114 | doc.Load(reader); |
| 115 | reader.Close(); | 115 | reader.Close(); |
| 116 | rootNode = doc.FirstChild; | 116 | rootNode = doc.FirstChild; |
| 117 | |||
| 117 | foreach (XmlNode aPrimNode in rootNode.ChildNodes) | 118 | foreach (XmlNode aPrimNode in rootNode.ChildNodes) |
| 118 | { | 119 | { |
| 119 | CreatePrimFromXml2(scene, aPrimNode.OuterXml); | 120 | CreatePrimFromXml2(scene, aPrimNode.OuterXml); |