Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

2 files changed, 18 insertions, 6 deletions

diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
index 5d8f03c..39b89d3 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
@@ -2487,14 +2487,25 @@ namespace OpenSim.Region.Physics.OdePlugin
                 if (!childPrim && Body != IntPtr.Zero && !m_disabled)
                     d.BodyEnable(Body);
 
-                m_collisionCategories = CollisionCategories.Geom;
-                if (m_isphysical)
-                    m_collisionCategories |= CollisionCategories.Body;
+                if (m_isphantom && !m_isVolumeDetect)
+                {
+                    m_collisionCategories = 0;
+                    if(m_isphysical)
+                        m_collisionFlags = CollisionCategories.Land;
+                    else
+                        m_collisionFlags = 0;
+                }
+                else
+                {
+                    m_collisionCategories = CollisionCategories.Geom;
+                    if (m_isphysical)
+                        m_collisionCategories |= CollisionCategories.Body;
 
-                m_collisionFlags = m_default_collisionFlags | CollisionCategories.Land;
+                    m_collisionFlags = m_default_collisionFlags | CollisionCategories.Land;
 
-                if (m_collidesWater)
-                    m_collisionFlags |= CollisionCategories.Water;
+                    if (m_collidesWater)
+                        m_collisionFlags |= CollisionCategories.Water;
+                }
 
                 if (!childPrim)
                 {
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
index b111172..612eafd 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
@@ -128,6 +128,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         VolumeDtc,
 
         Physical,
+        Phantom,
         Selected,
         disabled,
         building,