Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster

4 files changed, 57 insertions, 14 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 0a1b921..f6f6a1a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1519,8 +1519,18 @@ namespace OpenSim.Region.Framework.Scenes
                 if (m_parentScene.Permissions.CanEditObject(group.UUID, remoteClient.AgentId))
                 {
                     // VolumeDetect can't be set via UI and will always be off when a change is made there
-                    if (PhysData.PhysShapeType == PhysShapeType.invalid)
-                        group.UpdatePrimFlags(localID, UsePhysics, SetTemporary, SetPhantom, false);
+                    // now only change volume dtc if phantom off
+
+                    if (PhysData.PhysShapeType == PhysShapeType.invalid) // check for extraPhysics data
+                    {
+                        bool vdtc;
+                        if (SetPhantom) // if phantom keep volumedtc
+                            vdtc = group.RootPart.VolumeDetectActive;
+                        else // else turn it off
+                            vdtc = false;
+
+                        group.UpdatePrimFlags(localID, UsePhysics, SetTemporary, SetPhantom, vdtc);
+                    }
                     else
                     {
                         SceneObjectPart part = GetSceneObjectPart(localID);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 7bd6c11..cb0a57a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1941,6 +1941,12 @@ namespace OpenSim.Region.Framework.Scenes
 //                            "[SCENE]: Storing {0}, {1} in {2}",
 //                            Name, UUID, m_scene.RegionInfo.RegionName);
 
+                        if (RootPart.Shape.PCode == 9 && RootPart.Shape.State != 0)
+                        {
+                            RootPart.Shape.State = 0;
+                            ScheduleGroupForFullUpdate();
+                        }
+
                         SceneObjectGroup backup_group = Copy(false);
                         backup_group.RootPart.Velocity = RootPart.Velocity;
                         backup_group.RootPart.Acceleration = RootPart.Acceleration;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 511ab19..c73fc98 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1830,7 +1830,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                 public void ApplyPhysics(uint _ObjectFlags, bool _VolumeDetectActive, bool building)
         {
-            VolumeDetectActive = _VolumeDetectActive; //?? as is used this is redundante
+            VolumeDetectActive = _VolumeDetectActive;
 
             if (!ParentGroup.Scene.CollidablePrims)
                 return;
@@ -1839,7 +1839,10 @@ namespace OpenSim.Region.Framework.Scenes
                 return;
 
             bool isPhysical = (_ObjectFlags & (uint) PrimFlags.Physics) != 0;
-            bool isPhantom = (_ObjectFlags & (uint) PrimFlags.Phantom) != 0;
+            bool isPhantom = (_ObjectFlags & (uint)PrimFlags.Phantom) != 0;
+
+            if (_VolumeDetectActive)
+                isPhantom = true;
 
             if (IsJoint())
             {
@@ -2065,6 +2068,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         /// <summary>
         /// Do a physics propery update for this part.
+        /// now also updates phantom and volume detector
         /// </summary>
         /// <param name="UsePhysics"></param>
         /// <param name="isNew"></param>
@@ -2096,7 +2100,7 @@ namespace OpenSim.Region.Framework.Scenes
                                 if (ParentGroup.RootPart == this)
                                     AngularVelocity = new Vector3(0, 0, 0);
 
-                                if (pa.Phantom)
+                                if (pa.Phantom && !VolumeDetectActive)
                                 {
                                     RemoveFromPhysics();
                                     return;
@@ -2143,6 +2147,14 @@ namespace OpenSim.Region.Framework.Scenes
                     if (pa.Phantom != phan)
                         pa.Phantom = phan;
 
+// some engines dont' have this check still
+//                    if (VolumeDetectActive != pa.IsVolumeDtc)
+                    {
+                        if (VolumeDetectActive)
+                            pa.SetVolumeDetect(1);
+                        else
+                            pa.SetVolumeDetect(0);
+                    }
 
                     // If this part is a sculpt then delay the physics update until we've asynchronously loaded the
                     // mesh data.
@@ -4599,6 +4611,12 @@ namespace OpenSim.Region.Framework.Scenes
             if ((UsePhysics == wasUsingPhysics) && (wasTemporary == SetTemporary) && (wasPhantom == SetPhantom) && (SetVD == wasVD))
                 return;
 
+            VolumeDetectActive = SetVD;
+
+            // volume detector implies phantom
+            if (VolumeDetectActive)
+                SetPhantom = true;
+
             if (UsePhysics)
                 AddFlag(PrimFlags.Physics);
             else
@@ -4614,7 +4632,6 @@ namespace OpenSim.Region.Framework.Scenes
             else
                 RemFlag(PrimFlags.TemporaryOnRez);
 
-            VolumeDetectActive = SetVD;
 
             if (ParentGroup.Scene == null)
                 return;
@@ -4624,7 +4641,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (pa != null && building && pa.Building != building)
                 pa.Building = building;
 
-            if ((SetPhantom && !UsePhysics) ||  ParentGroup.IsAttachment || PhysicsShapeType == (byte)PhysShapeType.none
+            if ((SetPhantom && !UsePhysics && !SetVD) ||  ParentGroup.IsAttachment || PhysicsShapeType == (byte)PhysShapeType.none
                 || (Shape.PathCurve == (byte)Extrusion.Flexible))
             {
                 if (pa != null)
@@ -4669,12 +4686,12 @@ namespace OpenSim.Region.Framework.Scenes
                     else // it already has a physical representation
                     {
                         DoPhysicsPropertyUpdate(UsePhysics, false); // Update physical status.
-
-                        if(VolumeDetectActive)
-                            pa.SetVolumeDetect(1);
-                        else
-                            pa.SetVolumeDetect(0);
-
+                        /* moved into DoPhysicsPropertyUpdate
+                                                if(VolumeDetectActive)
+                                                    pa.SetVolumeDetect(1);
+                                                else
+                                                    pa.SetVolumeDetect(0);
+                        */
                         if (pa.Building != building)
                             pa.Building = building;
                     }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 292dbdc..ac791ae 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1076,6 +1076,11 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void TeleportWithMomentum(Vector3 pos)
         {
+            TeleportWithMomentum(pos, null);
+        }
+
+        public void TeleportWithMomentum(Vector3 pos, Vector3? v)
+        {
             bool isFlying = Flying;
             Vector3 vel = Velocity;
             RemoveFromPhysicalScene();
@@ -1083,7 +1088,12 @@ namespace OpenSim.Region.Framework.Scenes
             AbsolutePosition = pos;
             AddToPhysicalScene(isFlying);
             if (PhysicsActor != null)
-                PhysicsActor.SetMomentum(vel);
+            {
+                if (v.HasValue)
+                    PhysicsActor.SetMomentum((Vector3)v);
+                else
+                    PhysicsActor.SetMomentum(vel);
+            }
 
             SendTerseUpdateToAllClients();
         }