* refactor: Attach a scene object to a scene separately from its construction

1 files changed, 2 insertions, 6 deletions

diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 435ce77..4e7494e 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -197,9 +197,6 @@ namespace OpenSim.Region.Environment.Scenes
         protected internal bool AddRestoredSceneObject(
             SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted)
         {
-            sceneObject.RegionHandle = m_regInfo.RegionHandle;
-            sceneObject.SetScene(m_parentScene);
-
             foreach (SceneObjectPart part in sceneObject.Children.Values)
             {
                 part.LocalId = m_parentScene.PrimIDAllocate();
@@ -251,9 +248,8 @@ namespace OpenSim.Region.Environment.Scenes
         {
             if (sceneObject == null || sceneObject.RootPart == null || sceneObject.RootPart.UUID == UUID.Zero)
                 return false;
-
-            sceneObject.ApplyPhysics(m_parentScene.m_physicalPrim);
-            sceneObject.ScheduleGroupForFullUpdate();
+            
+            sceneObject.AttachToScene(m_parentScene);
 
             lock (Entities)
             {