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

5 files changed, 615 insertions, 23 deletions

diff --git a/OpenSim/Region/Physics/Manager/IMesher.cs b/OpenSim/Region/Physics/Manager/IMesher.cs
index 06f3c8b..460b48e 100644
--- a/OpenSim/Region/Physics/Manager/IMesher.cs
+++ b/OpenSim/Region/Physics/Manager/IMesher.cs
@@ -82,5 +82,6 @@ namespace OpenSim.Region.Physics.Manager
         void Append(IMesh newMesh);
         void TransformLinear(float[,] matrix, float[] offset);
         Vector3 GetCentroid();
+        Vector3 GetOBB();
     }
 }
diff --git a/OpenSim/Region/Physics/Meshing/Mesh.cs b/OpenSim/Region/Physics/Meshing/Mesh.cs
index c715642..c03f18b 100644
--- a/OpenSim/Region/Physics/Meshing/Mesh.cs
+++ b/OpenSim/Region/Physics/Meshing/Mesh.cs
@@ -148,6 +148,12 @@ namespace OpenSim.Region.Physics.Meshing
                 return Vector3.Zero;
         }
 
+        // not functional
+        public Vector3 GetOBB()
+        {
+            return new Vector3(0.5f, 0.5f, 0.5f);
+        }
+
         public void CalcNormals()
         {
             int iTriangles = m_triangles.Count;
diff --git a/OpenSim/Region/Physics/UbitMeshing/Mesh.cs b/OpenSim/Region/Physics/UbitMeshing/Mesh.cs
index 98c0f0b..47e0cf4 100644
--- a/OpenSim/Region/Physics/UbitMeshing/Mesh.cs
+++ b/OpenSim/Region/Physics/UbitMeshing/Mesh.cs
@@ -48,8 +48,14 @@ namespace OpenSim.Region.Physics.Meshing
         int m_indexCount = 0;
         public float[] m_normals;
         Vector3 m_centroid;
-        int m_centroidDiv;
+        float m_obbXmin;
+        float m_obbXmax;
+        float m_obbYmin;
+        float m_obbYmax;
+        float m_obbZmin;
+        float m_obbZmax;
 
+        int m_centroidDiv;
 
         private class vertexcomp : IEqualityComparer<Vertex>
         {
@@ -77,6 +83,14 @@ namespace OpenSim.Region.Physics.Meshing
             m_triangles = new List<Triangle>();
             m_centroid = Vector3.Zero;
             m_centroidDiv = 0;
+            m_obbXmin = float.MaxValue;
+            m_obbXmax = float.MinValue;
+            m_obbYmin = float.MaxValue;
+            m_obbYmax = float.MinValue;
+            m_obbZmin = float.MaxValue;
+            m_obbZmax = float.MinValue;
+
+
         }
 
         public int RefCount { get; set; }
@@ -102,6 +116,35 @@ namespace OpenSim.Region.Physics.Meshing
             return result;
         }
 
+        public void addVertexLStats(Vertex v)
+        {
+            float x = v.X;
+            float y = v.Y;
+            float z = v.Z;
+
+            m_centroid.X += x;
+            m_centroid.Y += y;
+            m_centroid.Z += z;
+            m_centroidDiv++;
+
+            if (x > m_obbXmax)
+                m_obbXmax = x;
+            else if (x < m_obbXmin)
+                m_obbXmin = x;
+
+            if (y > m_obbYmax)
+                m_obbYmax = y;
+            else if (y < m_obbYmin)
+                m_obbYmin = y;
+
+            if (z > m_obbZmax)
+                m_obbZmax = z;
+            else if (z < m_obbZmin)
+                m_obbZmin = z;
+
+        }
+
+
         public void Add(Triangle triangle)
         {
             if (m_pinnedIndex.IsAllocated || m_pinnedVertexes.IsAllocated || m_indicesPtr != IntPtr.Zero || m_verticesPtr != IntPtr.Zero)
@@ -127,26 +170,17 @@ namespace OpenSim.Region.Physics.Meshing
             if (!m_vertices.ContainsKey(triangle.v1))
             {
                 m_vertices[triangle.v1] = m_vertices.Count;
-                m_centroid.X += triangle.v1.X;
-                m_centroid.Y += triangle.v1.Y;
-                m_centroid.Z += triangle.v1.Z;
-                m_centroidDiv++;
+                addVertexLStats(triangle.v1);
             }
             if (!m_vertices.ContainsKey(triangle.v2))
             {
                 m_vertices[triangle.v2] = m_vertices.Count;
-                m_centroid.X += triangle.v2.X;
-                m_centroid.Y += triangle.v2.Y;
-                m_centroid.Z += triangle.v2.Z;
-                m_centroidDiv++;
+                addVertexLStats(triangle.v2);
             }
             if (!m_vertices.ContainsKey(triangle.v3))
             {
                 m_vertices[triangle.v3] = m_vertices.Count;
-                m_centroid.X += triangle.v3.X;
-                m_centroid.Y += triangle.v3.Y;
-                m_centroid.Z += triangle.v3.Z;
-                m_centroidDiv++;
+                addVertexLStats(triangle.v3);
             }
             m_triangles.Add(triangle);
         }
@@ -159,6 +193,24 @@ namespace OpenSim.Region.Physics.Meshing
                 return Vector3.Zero;
         }
 
+        public Vector3 GetOBB()
+        {
+            float x, y, z;
+            if (m_centroidDiv > 0)
+            {
+                x = (m_obbXmax - m_obbXmin) * 0.5f;
+                y = (m_obbYmax - m_obbYmin) * 0.5f;
+                z = (m_obbZmax - m_obbZmin) * 0.5f;
+            }
+            else // ??
+            {
+                x = 0.5f;
+                y = 0.5f;
+                z = 0.5f;
+            }
+            return new Vector3(x, y, z);
+        }
+
         public void CalcNormals()
         {
             int iTriangles = m_triangles.Count;
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEMeshWorker.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEMeshWorker.cs
index b0231e9..9bf3667 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODEMeshWorker.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEMeshWorker.cs
@@ -24,16 +24,20 @@ namespace OpenSim.Region.Physics.OdePlugin
         private OdeScene m_scene;
         private IMesher m_mesher;
 
+
         public bool meshSculptedPrim = true;
         public bool forceSimplePrimMeshing = false;
         public float meshSculptLOD = 32;
         public float MeshSculptphysicalLOD = 32;
 
-        public ODEMeshWorker(OdeScene pScene, ILog pLog, IMesher pMesher, IConfig pConfig)
+        private IntPtr m_workODEspace = IntPtr.Zero;
+
+        public ODEMeshWorker(OdeScene pScene, ILog pLog, IMesher pMesher, IntPtr pWorkSpace, IConfig pConfig)
         {
             m_scene = pScene;
             m_log = pLog;
-            m_mesher = pMesher;          
+            m_mesher = pMesher;
+            m_workODEspace = pWorkSpace;
 
             if (pConfig != null)
             {
@@ -196,24 +200,508 @@ namespace OpenSim.Region.Physics.OdePlugin
                     if (pbs.SculptTexture == UUID.Zero)
                         return null;
 
-                    if(pbs.SculptType != (byte)SculptType.Mesh)
+                    if (pbs.SculptType != (byte)SculptType.Mesh)
                     { // check for sculpt decoded image on cache)
                         if (File.Exists(System.IO.Path.Combine("j2kDecodeCache", "smap_" + pbs.SculptTexture.ToString())))
                             return m_mesher.CreateMesh(actor.Name, pbs, size, clod, true, convex);
                     }
 
-                    if(pbs.SculptData != null && pbs.SculptData.Length >0)
+                    if (pbs.SculptData != null && pbs.SculptData.Length > 0)
                         return m_mesher.CreateMesh(actor.Name, pbs, size, clod, true, convex);
 
                     ODEAssetRequest asr;
                     RequestAssetDelegate assetProvider = m_scene.RequestAssetMethod;
                     if (assetProvider != null)
-                        asr = new ODEAssetRequest(this, assetProvider, actor, pbs);
+                        asr = new ODEAssetRequest(this, assetProvider, actor, pbs, m_log);
+
                     return null;
                 }
             }
             return mesh;
         }
+
+        private bool GetTriMeshGeo(ODEPhysRepData repData)
+        {
+            IntPtr vertices, indices;
+            IntPtr triMeshData = IntPtr.Zero;
+            IntPtr geo = IntPtr.Zero;
+            int vertexCount, indexCount;
+            int vertexStride, triStride;
+
+            PhysicsActor actor = repData.actor;
+
+            IMesh mesh = repData.mesh;
+
+            if (mesh == null)
+            {
+                mesh = getMesh(repData.actor, repData.pbs, repData.size, repData.shapetype);
+            }
+
+            if (mesh == null)
+                return false;
+
+            mesh.getVertexListAsPtrToFloatArray(out vertices, out vertexStride, out vertexCount); // Note, that vertices are fixed in unmanaged heap
+            mesh.getIndexListAsPtrToIntArray(out indices, out triStride, out indexCount); // Also fixed, needs release after usage
+
+            if (vertexCount == 0 || indexCount == 0)
+            {
+                m_log.WarnFormat("[PHYSICS]: Invalid mesh data on prim {0} mesh UUID {1}",
+                    actor.Name, repData.pbs.SculptTexture.ToString());
+                mesh.releaseSourceMeshData();
+                return false;
+            }
+
+            repData.OBBOffset = mesh.GetCentroid();
+            repData.OBB = mesh.GetOBB();
+            repData.hasOBB = true;
+            repData.physCost = 0.0013f * (float)indexCount;
+
+            mesh.releaseSourceMeshData();
+
+            try
+            {
+                triMeshData = d.GeomTriMeshDataCreate();
+
+                d.GeomTriMeshDataBuildSimple(triMeshData, vertices, vertexStride, vertexCount, indices, indexCount, triStride);
+                d.GeomTriMeshDataPreprocess(triMeshData);
+
+                m_scene.waitForSpaceUnlock(m_workODEspace);
+                geo = d.CreateTriMesh(m_workODEspace, triMeshData, null, null, null);
+            }
+
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("[PHYSICS]: SetGeom Mesh failed for {0} exception: {1}", actor.Name, e);
+                if (triMeshData != IntPtr.Zero)
+                {
+                    d.GeomTriMeshDataDestroy(triMeshData);
+                    repData.triMeshData = IntPtr.Zero;
+                }
+                repData.geo = IntPtr.Zero;
+                return false;
+            }
+
+            repData.geo = geo;
+            repData.triMeshData = triMeshData;
+            repData.curSpace = m_workODEspace;
+            return true;
+        }
+
+        public ODEPhysRepData CreateActorPhysRep(PhysicsActor actor, PrimitiveBaseShape pbs, IMesh pMesh, Vector3 size, byte shapetype)
+        {
+            ODEPhysRepData repData = new ODEPhysRepData();
+
+            repData.actor = actor;
+            repData.pbs = pbs;
+            repData.mesh = pMesh;
+            repData.size = size;
+            repData.shapetype = shapetype;
+
+            IntPtr geo = IntPtr.Zero;
+            bool hasMesh = false;
+            if (needsMeshing(pbs))
+            {
+                if (GetTriMeshGeo(repData))
+                    hasMesh = true;
+                else
+                    repData.canColide = false;
+            }
+
+            if (!hasMesh)
+            {
+                if (pbs.ProfileShape == ProfileShape.HalfCircle && pbs.PathCurve == (byte)Extrusion.Curve1
+                    && size.X == size.Y && size.Y == size.Z)
+                { // it's a sphere
+                    m_scene.waitForSpaceUnlock(m_workODEspace);
+                    try
+                    {
+                        geo = d.CreateSphere(m_workODEspace, size.X * 0.5f);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.WarnFormat("[PHYSICS]: Create sphere failed: {0}", e);
+                        return null;
+                    }
+                }
+                else
+                {// do it as a box
+                    m_scene.waitForSpaceUnlock(m_workODEspace);
+                    try
+                    {
+                        //Console.WriteLine("  CreateGeom 4");
+                        geo = d.CreateBox(m_workODEspace, size.X, size.Y, size.Z);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.Warn("[PHYSICS]: Create box failed: {0}", e);
+                        return null;
+                    }
+                }
+
+                repData.physCost = 0.1f;
+                repData.streamCost = 1.0f;
+                repData.geo = geo;
+            }
+            
+            repData.curSpace = m_workODEspace;
+
+            CalcVolumeData(repData);
+
+            return repData;
+        }
+
+        private void CalculateBasicPrimVolume(ODEPhysRepData repData)
+        {
+            PrimitiveBaseShape _pbs = repData.pbs;
+            Vector3 _size = repData.size;
+
+            float volume = _size.X * _size.Y * _size.Z; // default
+            float tmp;
+
+            float hollowAmount = (float)_pbs.ProfileHollow * 2.0e-5f;
+            float hollowVolume = hollowAmount * hollowAmount;
+
+            switch (_pbs.ProfileShape)
+            {
+                case ProfileShape.Square:
+                    // default box
+
+                    if (_pbs.PathCurve == (byte)Extrusion.Straight)
+                    {
+                        if (hollowAmount > 0.0)
+                        {
+                            switch (_pbs.HollowShape)
+                            {
+                                case HollowShape.Square:
+                                case HollowShape.Same:
+                                    break;
+
+                                case HollowShape.Circle:
+
+                                    hollowVolume *= 0.78539816339f;
+                                    break;
+
+                                case HollowShape.Triangle:
+
+                                    hollowVolume *= (0.5f * .5f);
+                                    break;
+
+                                default:
+                                    hollowVolume = 0;
+                                    break;
+                            }
+                            volume *= (1.0f - hollowVolume);
+                        }
+                    }
+
+                    else if (_pbs.PathCurve == (byte)Extrusion.Curve1)
+                    {
+                        //a tube 
+
+                        volume *= 0.78539816339e-2f * (float)(200 - _pbs.PathScaleX);
+                        tmp = 1.0f - 2.0e-2f * (float)(200 - _pbs.PathScaleY);
+                        volume -= volume * tmp * tmp;
+
+                        if (hollowAmount > 0.0)
+                        {
+                            hollowVolume *= hollowAmount;
+
+                            switch (_pbs.HollowShape)
+                            {
+                                case HollowShape.Square:
+                                case HollowShape.Same:
+                                    break;
+
+                                case HollowShape.Circle:
+                                    hollowVolume *= 0.78539816339f;
+                                    break;
+
+                                case HollowShape.Triangle:
+                                    hollowVolume *= 0.5f * 0.5f;
+                                    break;
+                                default:
+                                    hollowVolume = 0;
+                                    break;
+                            }
+                            volume *= (1.0f - hollowVolume);
+                        }
+                    }
+
+                    break;
+
+                case ProfileShape.Circle:
+
+                    if (_pbs.PathCurve == (byte)Extrusion.Straight)
+                    {
+                        volume *= 0.78539816339f; // elipse base
+
+                        if (hollowAmount > 0.0)
+                        {
+                            switch (_pbs.HollowShape)
+                            {
+                                case HollowShape.Same:
+                                case HollowShape.Circle:
+                                    break;
+
+                                case HollowShape.Square:
+                                    hollowVolume *= 0.5f * 2.5984480504799f;
+                                    break;
+
+                                case HollowShape.Triangle:
+                                    hollowVolume *= .5f * 1.27323954473516f;
+                                    break;
+
+                                default:
+                                    hollowVolume = 0;
+                                    break;
+                            }
+                            volume *= (1.0f - hollowVolume);
+                        }
+                    }
+
+                    else if (_pbs.PathCurve == (byte)Extrusion.Curve1)
+                    {
+                        volume *= 0.61685027506808491367715568749226e-2f * (float)(200 - _pbs.PathScaleX);
+                        tmp = 1.0f - .02f * (float)(200 - _pbs.PathScaleY);
+                        volume *= (1.0f - tmp * tmp);
+
+                        if (hollowAmount > 0.0)
+                        {
+
+                            // calculate the hollow volume by it's shape compared to the prim shape
+                            hollowVolume *= hollowAmount;
+
+                            switch (_pbs.HollowShape)
+                            {
+                                case HollowShape.Same:
+                                case HollowShape.Circle:
+                                    break;
+
+                                case HollowShape.Square:
+                                    hollowVolume *= 0.5f * 2.5984480504799f;
+                                    break;
+
+                                case HollowShape.Triangle:
+                                    hollowVolume *= .5f * 1.27323954473516f;
+                                    break;
+
+                                default:
+                                    hollowVolume = 0;
+                                    break;
+                            }
+                            volume *= (1.0f - hollowVolume);
+                        }
+                    }
+                    break;
+
+                case ProfileShape.HalfCircle:
+                    if (_pbs.PathCurve == (byte)Extrusion.Curve1)
+                    {
+                        volume *= 0.5236f;
+
+                        if (hollowAmount > 0.0)
+                        {
+                            hollowVolume *= hollowAmount;
+
+                            switch (_pbs.HollowShape)
+                            {
+                                case HollowShape.Circle:
+                                case HollowShape.Triangle:  // diference in sl is minor and odd
+                                case HollowShape.Same:
+                                    break;
+
+                                case HollowShape.Square:
+                                    hollowVolume *= 0.909f;
+                                    break;
+
+                                //                                case HollowShape.Triangle:
+                                //                                    hollowVolume *= .827f;
+                                //                                    break;
+                                default:
+                                    hollowVolume = 0;
+                                    break;
+                            }
+                            volume *= (1.0f - hollowVolume);
+                        }
+
+                    }
+                    break;
+
+                case ProfileShape.EquilateralTriangle:
+
+                    if (_pbs.PathCurve == (byte)Extrusion.Straight)
+                    {
+                        volume *= 0.32475953f;
+
+                        if (hollowAmount > 0.0)
+                        {
+
+                            // calculate the hollow volume by it's shape compared to the prim shape
+                            switch (_pbs.HollowShape)
+                            {
+                                case HollowShape.Same:
+                                case HollowShape.Triangle:
+                                    hollowVolume *= .25f;
+                                    break;
+
+                                case HollowShape.Square:
+                                    hollowVolume *= 0.499849f * 3.07920140172638f;
+                                    break;
+
+                                case HollowShape.Circle:
+                                    // Hollow shape is a perfect cyllinder in respect to the cube's scale
+                                    // Cyllinder hollow volume calculation
+
+                                    hollowVolume *= 0.1963495f * 3.07920140172638f;
+                                    break;
+
+                                default:
+                                    hollowVolume = 0;
+                                    break;
+                            }
+                            volume *= (1.0f - hollowVolume);
+                        }
+                    }
+                    else if (_pbs.PathCurve == (byte)Extrusion.Curve1)
+                    {
+                        volume *= 0.32475953f;
+                        volume *= 0.01f * (float)(200 - _pbs.PathScaleX);
+                        tmp = 1.0f - .02f * (float)(200 - _pbs.PathScaleY);
+                        volume *= (1.0f - tmp * tmp);
+
+                        if (hollowAmount > 0.0)
+                        {
+
+                            hollowVolume *= hollowAmount;
+
+                            switch (_pbs.HollowShape)
+                            {
+                                case HollowShape.Same:
+                                case HollowShape.Triangle:
+                                    hollowVolume *= .25f;
+                                    break;
+
+                                case HollowShape.Square:
+                                    hollowVolume *= 0.499849f * 3.07920140172638f;
+                                    break;
+
+                                case HollowShape.Circle:
+
+                                    hollowVolume *= 0.1963495f * 3.07920140172638f;
+                                    break;
+
+                                default:
+                                    hollowVolume = 0;
+                                    break;
+                            }
+                            volume *= (1.0f - hollowVolume);
+                        }
+                    }
+                    break;
+
+                default:
+                    break;
+            }
+
+            float taperX1;
+            float taperY1;
+            float taperX;
+            float taperY;
+            float pathBegin;
+            float pathEnd;
+            float profileBegin;
+            float profileEnd;
+
+            if (_pbs.PathCurve == (byte)Extrusion.Straight || _pbs.PathCurve == (byte)Extrusion.Flexible)
+            {
+                taperX1 = _pbs.PathScaleX * 0.01f;
+                if (taperX1 > 1.0f)
+                    taperX1 = 2.0f - taperX1;
+                taperX = 1.0f - taperX1;
+
+                taperY1 = _pbs.PathScaleY * 0.01f;
+                if (taperY1 > 1.0f)
+                    taperY1 = 2.0f - taperY1;
+                taperY = 1.0f - taperY1;
+            }
+            else
+            {
+                taperX = _pbs.PathTaperX * 0.01f;
+                if (taperX < 0.0f)
+                    taperX = -taperX;
+                taperX1 = 1.0f - taperX;
+
+                taperY = _pbs.PathTaperY * 0.01f;
+                if (taperY < 0.0f)
+                    taperY = -taperY;
+                taperY1 = 1.0f - taperY;
+            }
+
+            volume *= (taperX1 * taperY1 + 0.5f * (taperX1 * taperY + taperX * taperY1) + 0.3333333333f * taperX * taperY);
+
+            pathBegin = (float)_pbs.PathBegin * 2.0e-5f;
+            pathEnd = 1.0f - (float)_pbs.PathEnd * 2.0e-5f;
+            volume *= (pathEnd - pathBegin);
+
+            // this is crude aproximation
+            profileBegin = (float)_pbs.ProfileBegin * 2.0e-5f;
+            profileEnd = 1.0f - (float)_pbs.ProfileEnd * 2.0e-5f;
+            volume *= (profileEnd - profileBegin);           
+
+            repData.volume = volume;
+        }
+
+        private void CalcVolumeData(ODEPhysRepData repData)
+        {
+            float volume;
+            Vector3 OBB = repData.size;
+            Vector3 OBBoffset;
+            IntPtr geo = repData.geo;
+
+            if (geo == IntPtr.Zero || repData.triMeshData == IntPtr.Zero)
+            {
+                OBB.X *= 0.5f;
+                OBB.Y *= 0.5f;
+                OBB.Z *= 0.5f;
+
+                repData.OBB = OBB;
+                repData.OBBOffset = Vector3.Zero;
+            }
+            else if (!repData.hasOBB) // should this happen?
+            {
+                d.AABB AABB;
+                d.GeomGetAABB(geo, out AABB); // get the AABB from engine geom
+
+                OBB.X = (AABB.MaxX - AABB.MinX) * 0.5f;
+                OBB.Y = (AABB.MaxY - AABB.MinY) * 0.5f;
+                OBB.Z = (AABB.MaxZ - AABB.MinZ) * 0.5f;
+                repData.OBB = OBB;
+                OBBoffset.X = (AABB.MaxX + AABB.MinX) * 0.5f;
+                OBBoffset.Y = (AABB.MaxY + AABB.MinY) * 0.5f;
+                OBBoffset.Z = (AABB.MaxZ + AABB.MinZ) * 0.5f;
+                repData.OBBOffset = Vector3.Zero;
+            }
+
+            // also its own inertia and mass
+            // keep using basic shape mass for now
+            CalculateBasicPrimVolume(repData);
+
+            if (repData.hasOBB)
+            {
+                OBB = repData.OBB;
+                float pc = repData.physCost;
+                float psf = OBB.X * (OBB.Y + OBB.Z) + OBB.Y * OBB.Z;
+                psf *= 1.33f * .2f;
+
+                pc *= psf;
+                if (pc < 0.1f)
+                    pc = 0.1f;
+
+                repData.physCost = pc;
+            }
+            else
+                repData.physCost = 0.1f;
+        }
     }
 
     public class ODEAssetRequest
@@ -221,12 +709,15 @@ namespace OpenSim.Region.Physics.OdePlugin
         PhysicsActor m_actor;
         ODEMeshWorker m_worker;
         PrimitiveBaseShape m_pbs;
+        private ILog m_log;
 
-        public ODEAssetRequest(ODEMeshWorker pWorker, RequestAssetDelegate provider, PhysicsActor pActor, PrimitiveBaseShape ppbs)
+        public ODEAssetRequest(ODEMeshWorker pWorker, RequestAssetDelegate provider,
+            PhysicsActor pActor, PrimitiveBaseShape ppbs, ILog plog)
         {
             m_actor = pActor;
             m_worker = pWorker;
             m_pbs = ppbs;
+            m_log = plog;
 
             if (provider == null)
                 return;
@@ -240,10 +731,22 @@ namespace OpenSim.Region.Physics.OdePlugin
 
         void ODEassetReceived(AssetBase asset)
         {
-            if (m_actor != null && m_pbs != null && asset != null && asset.Data != null && asset.Data.Length > 0)
+            if (m_actor != null && m_pbs != null)
             {
-                m_pbs.SculptData = asset.Data;
-                m_actor.Shape = m_pbs;
+                if (asset != null)
+                {
+                    if (asset.Data != null && asset.Data.Length > 0)
+                    {
+                        m_pbs.SculptData = asset.Data;
+                        m_actor.Shape = m_pbs;
+                    }
+                    else
+                        m_log.WarnFormat("[PHYSICS]: asset provider returned invalid mesh data for prim {0} asset UUID {1}.",
+                            m_actor.Name, asset.ID.ToString());
+                }
+                else
+                    m_log.WarnFormat("[PHYSICS]: asset provider returned null asset fo mesh of prim {0}.",
+                        m_actor.Name);
             }
         }
     }
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
index 7c00600..d426112 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
@@ -60,6 +60,29 @@ namespace OpenSim.Region.Physics.OdePlugin
         public int lastframe;
     }
 
+    public class ODEPhysRepData
+    {
+        public PhysicsActor actor;
+        public IntPtr geo = IntPtr.Zero;
+        public IntPtr triMeshData = IntPtr.Zero;
+        public IMesh mesh;
+        public IntPtr curSpace = IntPtr.Zero;
+        public PrimitiveBaseShape pbs;
+
+        public Vector3 size = Vector3.Zero;
+        public Vector3 OBB = Vector3.Zero;
+        public Vector3 OBBOffset = Vector3.Zero;
+
+        public float volume;
+
+        public float physCost = 0.0f;
+        public float streamCost = 0;
+        public byte shapetype = 0;
+        public bool canColide = true;
+        public bool hasOBB = false;
+        public bool hasMeshVolume = false;
+    }
+
     // colision flags of things others can colide with
     // rays, sensors, probes removed since can't  be colided with
     // The top space where things are placed provided further selection
@@ -297,6 +320,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         public IntPtr TopSpace; // the global space
         public IntPtr ActiveSpace; // space for active prims
         public IntPtr StaticSpace; // space for the static things around
+        public IntPtr WorkSpace; // no collisions work space
 
         // some speedup variables
         private int spaceGridMaxX;
@@ -369,6 +393,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                     // now the major subspaces
                     ActiveSpace = d.HashSpaceCreate(TopSpace);
                     StaticSpace = d.HashSpaceCreate(TopSpace);
+                    WorkSpace = d.HashSpaceCreate(TopSpace);
                     }
                 catch
                     {
@@ -378,10 +403,12 @@ namespace OpenSim.Region.Physics.OdePlugin
                 d.HashSpaceSetLevels(TopSpace, -2, 8);
                 d.HashSpaceSetLevels(ActiveSpace, -2, 8);
                 d.HashSpaceSetLevels(StaticSpace, -2, 8);
+                d.HashSpaceSetLevels(WorkSpace, -2, 8);
 
                 // demote to second level
                 d.SpaceSetSublevel(ActiveSpace, 1);
                 d.SpaceSetSublevel(StaticSpace, 1);
+                d.SpaceSetSublevel(WorkSpace, 1);
 
                 d.GeomSetCategoryBits(ActiveSpace, (uint)(CollisionCategories.Space |
                                                         CollisionCategories.Geom |
@@ -399,6 +426,9 @@ namespace OpenSim.Region.Physics.OdePlugin
                                                         ));
                 d.GeomSetCollideBits(StaticSpace, 0);
 
+                d.GeomSetCategoryBits(WorkSpace, 0);
+                d.GeomSetCollideBits(WorkSpace, 0);
+
                 contactgroup = d.JointGroupCreate(0);
                 //contactgroup
 
@@ -478,7 +508,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                 }
             }
 
-            m_meshWorker = new ODEMeshWorker(this, m_log, meshmerizer, physicsconfig);
+            m_meshWorker = new ODEMeshWorker(this, m_log, meshmerizer, WorkSpace, physicsconfig);
 
             HalfOdeStep = ODE_STEPSIZE * 0.5f;
             odetimestepMS = (int)(1000.0f * ODE_STEPSIZE +0.5f);