diff options
| author | Justin Clark-Casey (justincc) | 2012-05-16 00:10:42 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-05-16 00:10:42 +0100 |
| commit | 23ae24b4061f7c1e1bc1c0d5428374ccf4e25891 (patch) | |
| tree | f850abd0af240f647d5e563e0f36c8cb98c954dd /OpenSim/Region/CoreModules | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-23ae24b4061f7c1e1bc1c0d5428374ccf4e25891.zip opensim-SC-23ae24b4061f7c1e1bc1c0d5428374ccf4e25891.tar.gz opensim-SC-23ae24b4061f7c1e1bc1c0d5428374ccf4e25891.tar.bz2 opensim-SC-23ae24b4061f7c1e1bc1c0d5428374ccf4e25891.tar.xz | |
Route OAR SOG loading through the common SceneObjectSerializer.FromXml2Format() rather than the functionally identical but buggy Xml2ToSOG().
Remove buggy Xml2ToSOG().
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 11eca12..2b61800 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
| @@ -267,8 +267,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
| 267 | } | 267 | } |
| 268 | */ | 268 | */ |
| 269 | 269 | ||
| 270 | SceneObjectGroup sceneObject = SceneObjectSerializer.FromXml2Format(serialisedSceneObject); | 270 | SceneObjectGroup sceneObject = serialiser.DeserializeGroupFromXml2(serialisedSceneObject); |
| 271 | // SceneObjectGroup sceneObject = serialiser.DeserializeGroupFromXml2(serialisedSceneObject); | ||
| 272 | 271 | ||
| 273 | bool isTelehub = (sceneObject.UUID == oldTelehubUUID); | 272 | bool isTelehub = (sceneObject.UUID == oldTelehubUUID); |
| 274 | 273 | ||