aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorTeravus Ovares2007-12-14 17:32:13 +0000
committerTeravus Ovares2007-12-14 17:32:13 +0000
commita0d14964759c0bf51c111c7f0723ffdcd5c52f1b (patch)
treed47041edc2cfd94496b63e0a3728540cdc774057 /OpenSim/Region
parentstubbing in OpenSimExport program. This does nothing (diff)
downloadopensim-SC_OLD-a0d14964759c0bf51c111c7f0723ffdcd5c52f1b.zip
opensim-SC_OLD-a0d14964759c0bf51c111c7f0723ffdcd5c52f1b.tar.gz
opensim-SC_OLD-a0d14964759c0bf51c111c7f0723ffdcd5c52f1b.tar.bz2
opensim-SC_OLD-a0d14964759c0bf51c111c7f0723ffdcd5c52f1b.tar.xz
* Fixed a cause of an ODE 'invalid operation for locked space '
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs30
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
560 group.AbsolutePosition = pos; 560 group.AbsolutePosition = pos;
561 SceneObjectPart rootPart = group.GetChildPart(group.UUID); 561 SceneObjectPart rootPart = group.GetChildPart(group.UUID);
562 rootPart.ApplySanePermissions(); 562 rootPart.ApplySanePermissions();
563 bool UsePhysics = (((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Physics) > 0)&& m_physicalPrim); 563 //bool UsePhysics = (((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Physics) > 0)&& m_physicalPrim);
564 if ((rootPart.ObjectFlags & (uint) LLObject.ObjectFlags.Phantom) == 0) 564 //if ((rootPart.ObjectFlags & (uint) LLObject.ObjectFlags.Phantom) == 0)
565 { 565 //{
566 PrimitiveBaseShape pbs = rootPart.Shape; 566 //PrimitiveBaseShape pbs = rootPart.Shape;
567 rootPart.PhysActor = PhysicsScene.AddPrimShape( 567 //rootPart.PhysActor = PhysicsScene.AddPrimShape(
568 rootPart.Name, 568 //rootPart.Name,
569 pbs, 569 //pbs,
570 new PhysicsVector(rootPart.AbsolutePosition.X, rootPart.AbsolutePosition.Y, 570 //new PhysicsVector(rootPart.AbsolutePosition.X, rootPart.AbsolutePosition.Y,
571 rootPart.AbsolutePosition.Z), 571 // rootPart.AbsolutePosition.Z),
572 new PhysicsVector(rootPart.Scale.X, rootPart.Scale.Y, rootPart.Scale.Z), 572 //new PhysicsVector(rootPart.Scale.X, rootPart.Scale.Y, rootPart.Scale.Z),
573 new Quaternion(rootPart.RotationOffset.W, rootPart.RotationOffset.X, 573 //new Quaternion(rootPart.RotationOffset.W, rootPart.RotationOffset.X,
574 rootPart.RotationOffset.Y, rootPart.RotationOffset.Z), UsePhysics); 574 // rootPart.RotationOffset.Y, rootPart.RotationOffset.Z), UsePhysics);
575 575
576 rootPart.DoPhysicsPropertyUpdate(UsePhysics, true); 576 // rootPart.DoPhysicsPropertyUpdate(UsePhysics, true);
577 577
578 } 578 // }
579 rootPart.ScheduleFullUpdate(); 579 rootPart.ScheduleFullUpdate();
580 } 580 }
581 } 581 }