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/SerialiserModule.cs | |
parent | force Culture to en-US in BaseHttpserver.HandleRequest() --- this (diff) | |
download | opensim-SC_OLD-f8721c3c1cd5d4eb2827ea1cfd36e08f3a100345.zip opensim-SC_OLD-f8721c3c1cd5d4eb2827ea1cfd36e08f3a100345.tar.gz opensim-SC_OLD-f8721c3c1cd5d4eb2827ea1cfd36e08f3a100345.tar.bz2 opensim-SC_OLD-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/SerialiserModule.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs index eb3ab2e..cefd15f 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs | |||
@@ -112,9 +112,9 @@ namespace OpenSim.Region.Environment.Modules.World.Serialiser | |||
112 | SceneXmlLoader.SavePrimsToXml2(scene, fileName); | 112 | SceneXmlLoader.SavePrimsToXml2(scene, fileName); |
113 | } | 113 | } |
114 | 114 | ||
115 | public SceneObjectGroup LoadGroupFromXml2(Scene scene, string xmlString) | 115 | public SceneObjectGroup DeserializeGroupFromXml2(string xmlString) |
116 | { | 116 | { |
117 | return SceneXmlLoader.LoadGroupFromXml2(scene, xmlString); | 117 | return SceneXmlLoader.DeserializeGroupFromXml2(xmlString); |
118 | } | 118 | } |
119 | 119 | ||
120 | public string SaveGroupToXml2(SceneObjectGroup grp) | 120 | public string SaveGroupToXml2(SceneObjectGroup grp) |