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/Scenes | |
| 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/Scenes')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 3 |
1 files changed, 2 insertions, 1 deletions
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 | |||
| 1902 | m_log.Warn("{[INTERREGION]: A new prim arrived from a neighbor"); | 1902 | m_log.Warn("{[INTERREGION]: A new prim arrived from a neighbor"); |
| 1903 | if (XMLMethod == 0) | 1903 | if (XMLMethod == 0) |
| 1904 | { | 1904 | { |
| 1905 | m_serialiser.LoadGroupFromXml2(this, objXMLData); | 1905 | SceneObjectGroup sceneObject = m_serialiser.DeserializeGroupFromXml2(objXMLData); |
| 1906 | AddRestoredSceneObject(sceneObject, true, false); | ||
| 1906 | 1907 | ||
| 1907 | SceneObjectPart RootPrim = GetSceneObjectPart(primID); | 1908 | SceneObjectPart RootPrim = GetSceneObjectPart(primID); |
| 1908 | if (RootPrim != null) | 1909 | if (RootPrim != null) |