* Refactor: Move the responsibility for applying physics and sending the initial client update to Scene.AddSceneObject() from some of the SceneObjectGroup constructors

* I think this has been done cleanly from inspection and testing, but if prim creation or load suddenly starts playing up more than usual, please open a mantis
* This also has the effect of stopping the archiver generating ghost in-world prims
* Some code dupliction also removed

1 files changed, 1 insertions, 32 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
index 5591ddc..db16601 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.Environment.Scenes
         {
             XmlDocument doc = new XmlDocument();
             XmlNode rootNode;
-            int primCount = 0;
+
             if (fileName.StartsWith("http:") || File.Exists(fileName))
             {
                 XmlTextReader reader = new XmlTextReader(fileName);
@@ -65,33 +65,6 @@ namespace OpenSim.Region.Environment.Scenes
                     //obj.RegenerateFullIDs();
 
                     scene.AddSceneObject(obj, true);
-
-                    SceneObjectPart rootPart = obj.GetChildPart(obj.UUID);
-                    // Apply loadOffsets for load/import and move combinations
-                    rootPart.GroupPosition = rootPart.AbsolutePosition + loadOffset;
-                    bool UsePhysics = (((rootPart.GetEffectiveObjectFlags() & (uint) LLObject.ObjectFlags.Physics) > 0) &&
-                                       scene.m_physicalPrim);
-                    if ((rootPart.GetEffectiveObjectFlags() & (uint) LLObject.ObjectFlags.Phantom) == 0)
-                    {
-                        rootPart.PhysActor = scene.PhysicsScene.AddPrimShape(
-                            rootPart.Name,
-                            rootPart.Shape,
-                            new PhysicsVector(rootPart.AbsolutePosition.X + loadOffset.X,
-                                              rootPart.AbsolutePosition.Y + loadOffset.Y,
-                                              rootPart.AbsolutePosition.Z + loadOffset.Z),
-                            new PhysicsVector(rootPart.Scale.X, rootPart.Scale.Y, rootPart.Scale.Z),
-                            new Quaternion(rootPart.RotationOffset.W, rootPart.RotationOffset.X,
-                                           rootPart.RotationOffset.Y, rootPart.RotationOffset.Z), UsePhysics);
-
-                        // to quote from SceneObjectPart: Basic
-                        // Physics returns null..  joy joy joy.
-                        if (rootPart.PhysActor != null)
-                        {
-                            rootPart.PhysActor.LocalID = rootPart.LocalId;
-                            rootPart.DoPhysicsPropertyUpdate(UsePhysics, true);
-                        }
-                    }
-                    primCount++;
                 }
             }
             else
@@ -196,10 +169,6 @@ namespace OpenSim.Region.Environment.Scenes
             SceneObjectGroup obj = new SceneObjectGroup(xmlData);
 
             scene.AddSceneObjectFromStorage(obj);
-
-            obj.ApplyPhysics(scene.m_physicalPrim);
-
-            obj.ScheduleGroupForFullUpdate();
         }
 
         public static void SavePrimsToXml2(Scene scene, string fileName)