From f8721c3c1cd5d4eb2827ea1cfd36e08f3a100345 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 18 Jul 2008 14:42:06 +0000 Subject: * refactor: break out sog loading code into two parts so that post-deserialization changes can be carried out before adding it to a scene --- OpenSim/Region/Environment/Scenes/Scene.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'OpenSim/Region/Environment/Scenes') diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 4aa9cf9..bbb028d 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs @@ -1902,7 +1902,8 @@ namespace OpenSim.Region.Environment.Scenes m_log.Warn("{[INTERREGION]: A new prim arrived from a neighbor"); if (XMLMethod == 0) { - m_serialiser.LoadGroupFromXml2(this, objXMLData); + SceneObjectGroup sceneObject = m_serialiser.DeserializeGroupFromXml2(objXMLData); + AddRestoredSceneObject(sceneObject, true, false); SceneObjectPart RootPrim = GetSceneObjectPart(primID); if (RootPrim != null) -- cgit v1.1