diff options
author | Justin Clarke Casey | 2008-07-18 14:42:06 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-07-18 14:42:06 +0000 |
commit | f8721c3c1cd5d4eb2827ea1cfd36e08f3a100345 (patch) | |
tree | 42bb436a664127499180789e76edacb8e021709a /OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs | |
parent | force Culture to en-US in BaseHttpserver.HandleRequest() --- this (diff) | |
download | opensim-SC-f8721c3c1cd5d4eb2827ea1cfd36e08f3a100345.zip opensim-SC-f8721c3c1cd5d4eb2827ea1cfd36e08f3a100345.tar.gz opensim-SC-f8721c3c1cd5d4eb2827ea1cfd36e08f3a100345.tar.bz2 opensim-SC-f8721c3c1cd5d4eb2827ea1cfd36e08f3a100345.tar.xz |
* refactor: break out sog loading code into two parts so that post-deserialization changes can be carried out before adding it to a scene
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs index 6e48f8e..8a13f2b 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs +++ b/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs | |||
@@ -81,12 +81,11 @@ namespace OpenSim.Region.Environment.Modules.World.Serialiser | |||
81 | void SavePrimListToXml2(List<EntityBase> entityList, string fileName); | 81 | void SavePrimListToXml2(List<EntityBase> entityList, string fileName); |
82 | 82 | ||
83 | /// <summary> | 83 | /// <summary> |
84 | /// Load an individual scene object from the xml2 format | 84 | /// Deserializes a scene object from its xml2 representation. This does not load the object into the scene. |
85 | /// </summary> | 85 | /// </summary> |
86 | /// <param name="scene"></param> | ||
87 | /// <param name="xmlString"></param> | 86 | /// <param name="xmlString"></param> |
88 | /// <returns>The scene object created. null if the scene object already existed</returns> | 87 | /// <returns>The scene object created. null if the scene object already existed</returns> |
89 | SceneObjectGroup LoadGroupFromXml2(Scene scene, string xmlString); | 88 | SceneObjectGroup DeserializeGroupFromXml2(string xmlString); |
90 | 89 | ||
91 | /// <summary> | 90 | /// <summary> |
92 | /// Serialize an individual scene object into the xml2 format | 91 | /// Serialize an individual scene object into the xml2 format |