From 23ae24b4061f7c1e1bc1c0d5428374ccf4e25891 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 16 May 2012 00:10:42 +0100
Subject: Route OAR SOG loading through the common
 SceneObjectSerializer.FromXml2Format() rather than the functionally identical
 but buggy Xml2ToSOG().

Remove buggy Xml2ToSOG().
---
 OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'OpenSim/Region/CoreModules/World/Archiver')

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
                 }
                 */
 
-                SceneObjectGroup sceneObject = SceneObjectSerializer.FromXml2Format(serialisedSceneObject);
-//                SceneObjectGroup sceneObject = serialiser.DeserializeGroupFromXml2(serialisedSceneObject);
+                SceneObjectGroup sceneObject = serialiser.DeserializeGroupFromXml2(serialisedSceneObject);
 
                 bool isTelehub = (sceneObject.UUID == oldTelehubUUID);
 
-- 
cgit v1.1