* Fixed a cause of an ODE 'invalid operation for locked space '

1 files changed, 15 insertions, 15 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index f13178c..710e443 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -560,22 +560,22 @@ namespace OpenSim.Region.Environment.Scenes
             group.AbsolutePosition = pos;
             SceneObjectPart rootPart = group.GetChildPart(group.UUID);
             rootPart.ApplySanePermissions();
-            bool UsePhysics = (((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Physics) > 0)&& m_physicalPrim);
-            if ((rootPart.ObjectFlags & (uint) LLObject.ObjectFlags.Phantom) == 0)
-            {
-                PrimitiveBaseShape pbs = rootPart.Shape;
-                rootPart.PhysActor = PhysicsScene.AddPrimShape(
-                    rootPart.Name,
-                    pbs,
-                    new PhysicsVector(rootPart.AbsolutePosition.X, rootPart.AbsolutePosition.Y,
-                                      rootPart.AbsolutePosition.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);
-
-                rootPart.DoPhysicsPropertyUpdate(UsePhysics, true);
+            //bool UsePhysics = (((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Physics) > 0)&& m_physicalPrim);
+            //if ((rootPart.ObjectFlags & (uint) LLObject.ObjectFlags.Phantom) == 0)
+            //{
+                //PrimitiveBaseShape pbs = rootPart.Shape;
+                //rootPart.PhysActor = PhysicsScene.AddPrimShape(
+                    //rootPart.Name,
+                    //pbs,
+                    //new PhysicsVector(rootPart.AbsolutePosition.X, rootPart.AbsolutePosition.Y,
+                    //                  rootPart.AbsolutePosition.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);
+
+               // rootPart.DoPhysicsPropertyUpdate(UsePhysics, true);
                 
-            }
+           // }
             rootPart.ScheduleFullUpdate();
         }
     }