1 files changed, 387 insertions, 340 deletions

diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index b79e1a1..53d5e4c 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -193,67 +193,6 @@ namespace OpenSim.Region.Physics.Meshing
             m_log.Error("****** PrimMesh Parameters ******\n" + primMesh.ParamsToDisplayString());
         }
 
-        private ulong GetMeshKey(PrimitiveBaseShape pbs, Vector3 size, float lod)
-        {
-            ulong hash = 5381;
-
-            hash = djb2(hash, pbs.PathCurve);
-            hash = djb2(hash, (byte)((byte)pbs.HollowShape | (byte)pbs.ProfileShape));
-            hash = djb2(hash, pbs.PathBegin);
-            hash = djb2(hash, pbs.PathEnd);
-            hash = djb2(hash, pbs.PathScaleX);
-            hash = djb2(hash, pbs.PathScaleY);
-            hash = djb2(hash, pbs.PathShearX);
-            hash = djb2(hash, pbs.PathShearY);
-            hash = djb2(hash, (byte)pbs.PathTwist);
-            hash = djb2(hash, (byte)pbs.PathTwistBegin);
-            hash = djb2(hash, (byte)pbs.PathRadiusOffset);
-            hash = djb2(hash, (byte)pbs.PathTaperX);
-            hash = djb2(hash, (byte)pbs.PathTaperY);
-            hash = djb2(hash, pbs.PathRevolutions);
-            hash = djb2(hash, (byte)pbs.PathSkew);
-            hash = djb2(hash, pbs.ProfileBegin);
-            hash = djb2(hash, pbs.ProfileEnd);
-            hash = djb2(hash, pbs.ProfileHollow);
-
-            // TODO: Separate scale out from the primitive shape data (after
-            // scaling is supported at the physics engine level)
-            byte[] scaleBytes = size.GetBytes();
-            for (int i = 0; i < scaleBytes.Length; i++)
-                hash = djb2(hash, scaleBytes[i]);
-
-            // Include LOD in hash, accounting for endianness
-            byte[] lodBytes = new byte[4];
-            Buffer.BlockCopy(BitConverter.GetBytes(lod), 0, lodBytes, 0, 4);
-            if (!BitConverter.IsLittleEndian)
-            {
-                Array.Reverse(lodBytes, 0, 4);
-            }
-            for (int i = 0; i < lodBytes.Length; i++)
-                hash = djb2(hash, lodBytes[i]);
-
-            // include sculpt UUID
-            if (pbs.SculptEntry)
-            {
-                scaleBytes = pbs.SculptTexture.GetBytes();
-                for (int i = 0; i < scaleBytes.Length; i++)
-                    hash = djb2(hash, scaleBytes[i]);
-            }
-
-            return hash;
-        }
-
-        private ulong djb2(ulong hash, byte c)
-        {
-            return ((hash << 5) + hash) + (ulong)c;
-        }
-
-        private ulong djb2(ulong hash, ushort c)
-        {
-            hash = ((hash << 5) + hash) + (ulong)((byte)c);
-            return ((hash << 5) + hash) + (ulong)(c >> 8);
-        }
-
         /// <summary>
         /// Add a submesh to an existing list of coords and faces.
         /// </summary>
@@ -301,16 +240,22 @@ namespace OpenSim.Region.Physics.Meshing
             }
         }
 
+        /// <summary>
+        /// Create a physics mesh from data that comes with the prim.  The actual data used depends on the prim type.
+        /// </summary>
+        /// <param name="primName"></param>
+        /// <param name="primShape"></param>
+        /// <param name="size"></param>
+        /// <param name="lod"></param>
+        /// <returns></returns>
         private Mesh CreateMeshFromPrimMesher(string primName, PrimitiveBaseShape primShape, Vector3 size, float lod)
         {
-            PrimMesh primMesh;
-            PrimMesher.SculptMesh sculptMesh;
-
-            List<Coord> coords = new List<Coord>();
-            List<Face> faces = new List<Face>();
+//            m_log.DebugFormat(
+//                "[MESH]: Creating physics proxy for {0}, shape {1}",
+//                primName, (OpenMetaverse.SculptType)primShape.SculptType);
 
-            Image idata = null;
-            string decodedSculptFileName = "";
+            List<Coord> coords;
+            List<Face> faces;
 
             if (primShape.SculptEntry)
             {
@@ -319,337 +264,440 @@ namespace OpenSim.Region.Physics.Meshing
                     if (!useMeshiesPhysicsMesh)
                         return null;
 
-                    m_log.Debug("[MESH]: experimental mesh proxy generation");
+                    if (!GenerateCoordsAndFacesFromPrimMeshData(primName, primShape, size, out coords, out faces))
+                        return null;
+                }
+                else
+                {
+                    if (!GenerateCoordsAndFacesFromPrimSculptData(primName, primShape, size, lod, out coords, out faces))
+                        return null;
+                }
+            }
+            else
+            {
+                if (!GenerateCoordsAndFacesFromPrimShapeData(primName, primShape, size, lod, out coords, out faces))
+                    return null;
+            }
 
-                    OSD meshOsd = null;
+            // Remove the reference to any JPEG2000 sculpt data so it can be GCed
+            primShape.SculptData = Utils.EmptyBytes;
 
-                    if (primShape.SculptData.Length <= 0)
-                    {
-                        m_log.Error("[MESH]: asset data is zero length");
-                        return null;
-                    }
+            int numCoords = coords.Count;
+            int numFaces = faces.Count;
 
-                    long start = 0;
-                    using (MemoryStream data = new MemoryStream(primShape.SculptData))
-                    {
-                        try
-                        {
-                            OSD osd = OSDParser.DeserializeLLSDBinary(data);
-                            if (osd is OSDMap)
-                                meshOsd = (OSDMap)osd;
-                            else
-                            {
-                                m_log.Warn("[Mesh}: unable to cast mesh asset to OSDMap");
-                                return null;
-                            }
-                        }
-                        catch (Exception e)
-                        {
-                            m_log.Error("[MESH]: Exception deserializing mesh asset header:" + e.ToString());
-                        }
+            // Create the list of vertices
+            List<Vertex> vertices = new List<Vertex>();
+            for (int i = 0; i < numCoords; i++)
+            {
+                Coord c = coords[i];
+                vertices.Add(new Vertex(c.X, c.Y, c.Z));
+            }
 
-                        start = data.Position;
-                    }
+            Mesh mesh = new Mesh();
+            // Add the corresponding triangles to the mesh
+            for (int i = 0; i < numFaces; i++)
+            {
+                Face f = faces[i];
+                mesh.Add(new Triangle(vertices[f.v1], vertices[f.v2], vertices[f.v3]));
+            }
+
+            return mesh;
+        }
+
+        /// <summary>
+        /// Generate the co-ords and faces necessary to construct a mesh from the mesh data the accompanies a prim.
+        /// </summary>
+        /// <param name="primName"></param>
+        /// <param name="primShape"></param>
+        /// <param name="size"></param>
+        /// <param name="coords">Coords are added to this list by the method.</param>
+        /// <param name="faces">Faces are added to this list by the method.</param>
+        /// <returns>true if coords and faces were successfully generated, false if not</returns>
+        private bool GenerateCoordsAndFacesFromPrimMeshData(
+            string primName, PrimitiveBaseShape primShape, Vector3 size, out List<Coord> coords, out List<Face> faces)
+        {
+            m_log.DebugFormat("[MESH]: experimental mesh proxy generation for {0}", primName);
+
+            coords = new List<Coord>();
+            faces = new List<Face>();
+            OSD meshOsd = null;
+
+            if (primShape.SculptData.Length <= 0)
+            {
+                m_log.Error("[MESH]: asset data is zero length");
+                return false;
+            }
 
-                    if (meshOsd is OSDMap)
+            long start = 0;
+            using (MemoryStream data = new MemoryStream(primShape.SculptData))
+            {
+                try
+                {
+                    OSD osd = OSDParser.DeserializeLLSDBinary(data);
+                    if (osd is OSDMap)
+                        meshOsd = (OSDMap)osd;
+                    else
                     {
-                        OSDMap physicsParms = null;
-                        OSDMap map = (OSDMap)meshOsd;
-                        if (map.ContainsKey("physics_shape"))
-                            physicsParms = (OSDMap)map["physics_shape"]; // old asset format
-                        else if (map.ContainsKey("physics_mesh"))
-                            physicsParms = (OSDMap)map["physics_mesh"]; // new asset format
-
-                        if (physicsParms == null)
-                        {
-                            m_log.Warn("[MESH]: no recognized physics mesh found in mesh asset");
-                            return null;
-                        }
+                        m_log.Warn("[Mesh}: unable to cast mesh asset to OSDMap");
+                        return false;
+                    }
+                }
+                catch (Exception e)
+                {
+                    m_log.Error("[MESH]: Exception deserializing mesh asset header:" + e.ToString());
+                }
+
+                start = data.Position;
+            }
+
+            if (meshOsd is OSDMap)
+            {
+                OSDMap physicsParms = null;
+                OSDMap map = (OSDMap)meshOsd;
+                if (map.ContainsKey("physics_shape"))
+                    physicsParms = (OSDMap)map["physics_shape"]; // old asset format
+                else if (map.ContainsKey("physics_mesh"))
+                    physicsParms = (OSDMap)map["physics_mesh"]; // new asset format
+
+                if (physicsParms == null)
+                {
+                    m_log.Warn("[MESH]: no recognized physics mesh found in mesh asset");
+                    return false;
+                }
 
-                        int physOffset = physicsParms["offset"].AsInteger() + (int)start;
-                        int physSize = physicsParms["size"].AsInteger();
+                int physOffset = physicsParms["offset"].AsInteger() + (int)start;
+                int physSize = physicsParms["size"].AsInteger();
 
-                        if (physOffset < 0 || physSize == 0)
-                            return null; // no mesh data in asset
+                if (physOffset < 0 || physSize == 0)
+                    return false; // no mesh data in asset
 
-                        OSD decodedMeshOsd = new OSD();
-                        byte[] meshBytes = new byte[physSize];
-                        System.Buffer.BlockCopy(primShape.SculptData, physOffset, meshBytes, 0, physSize);
+                OSD decodedMeshOsd = new OSD();
+                byte[] meshBytes = new byte[physSize];
+                System.Buffer.BlockCopy(primShape.SculptData, physOffset, meshBytes, 0, physSize);
 //                        byte[] decompressed = new byte[physSize * 5];
-                        try
+                try
+                {
+                    using (MemoryStream inMs = new MemoryStream(meshBytes))
+                    {
+                        using (MemoryStream outMs = new MemoryStream())
                         {
-                            using (MemoryStream inMs = new MemoryStream(meshBytes))
+                            using (ZOutputStream zOut = new ZOutputStream(outMs))
                             {
-                                using (MemoryStream outMs = new MemoryStream())
+                                byte[] readBuffer = new byte[2048];
+                                int readLen = 0;
+                                while ((readLen = inMs.Read(readBuffer, 0, readBuffer.Length)) > 0)
                                 {
-                                    using (ZOutputStream zOut = new ZOutputStream(outMs))
-                                    {
-                                        byte[] readBuffer = new byte[2048];
-                                        int readLen = 0;
-                                        while ((readLen = inMs.Read(readBuffer, 0, readBuffer.Length)) > 0)
-                                        {
-                                            zOut.Write(readBuffer, 0, readLen);
-                                        }
-                                        zOut.Flush();
-                                        outMs.Seek(0, SeekOrigin.Begin);
-
-                                        byte[] decompressedBuf = outMs.GetBuffer();
-
-                                        decodedMeshOsd = OSDParser.DeserializeLLSDBinary(decompressedBuf);
-                                    }
+                                    zOut.Write(readBuffer, 0, readLen);
                                 }
+                                zOut.Flush();
+                                outMs.Seek(0, SeekOrigin.Begin);
+
+                                byte[] decompressedBuf = outMs.GetBuffer();
+
+                                decodedMeshOsd = OSDParser.DeserializeLLSDBinary(decompressedBuf);
                             }
                         }
-                        catch (Exception e)
-                        {
-                            m_log.Error("[MESH]: exception decoding physical mesh: " + e.ToString());
-                            return null;
-                        }
+                    }
+                }
+                catch (Exception e)
+                {
+                    m_log.Error("[MESH]: exception decoding physical mesh: " + e.ToString());
+                    return false;
+                }
 
-                        OSDArray decodedMeshOsdArray = null;
+                OSDArray decodedMeshOsdArray = null;
 
-                        // physics_shape is an array of OSDMaps, one for each submesh
-                        if (decodedMeshOsd is OSDArray)
-                        {
+                // physics_shape is an array of OSDMaps, one for each submesh
+                if (decodedMeshOsd is OSDArray)
+                {
 //                            Console.WriteLine("decodedMeshOsd for {0} - {1}", primName, Util.GetFormattedXml(decodedMeshOsd));
 
-                            decodedMeshOsdArray = (OSDArray)decodedMeshOsd;
-                            foreach (OSD subMeshOsd in decodedMeshOsdArray)
-                            {
-                                if (subMeshOsd is OSDMap)
-                                    AddSubMesh(subMeshOsd as OSDMap, size, coords, faces);
-                            }
-                        }
+                    decodedMeshOsdArray = (OSDArray)decodedMeshOsd;
+                    foreach (OSD subMeshOsd in decodedMeshOsdArray)
+                    {
+                        if (subMeshOsd is OSDMap)
+                            AddSubMesh(subMeshOsd as OSDMap, size, coords, faces);
                     }
                 }
-                else
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Generate the co-ords and faces necessary to construct a mesh from the sculpt data the accompanies a prim.
+        /// </summary>
+        /// <param name="primName"></param>
+        /// <param name="primShape"></param>
+        /// <param name="size"></param>
+        /// <param name="lod"></param>
+        /// <param name="coords">Coords are added to this list by the method.</param>
+        /// <param name="faces">Faces are added to this list by the method.</param>
+        /// <returns>true if coords and faces were successfully generated, false if not</returns>
+        private bool GenerateCoordsAndFacesFromPrimSculptData(
+            string primName, PrimitiveBaseShape primShape, Vector3 size, float lod, out List<Coord> coords, out List<Face> faces)
+        {
+            coords = new List<Coord>();
+            faces = new List<Face>();
+            PrimMesher.SculptMesh sculptMesh;
+            Image idata = null;
+            string decodedSculptFileName = "";
+
+            if (cacheSculptMaps && primShape.SculptTexture != UUID.Zero)
+            {
+                decodedSculptFileName = System.IO.Path.Combine(decodedSculptMapPath, "smap_" + primShape.SculptTexture.ToString());
+                try
                 {
-                    if (cacheSculptMaps && primShape.SculptTexture != UUID.Zero)
+                    if (File.Exists(decodedSculptFileName))
                     {
-                        decodedSculptFileName = System.IO.Path.Combine(decodedSculptMapPath, "smap_" + primShape.SculptTexture.ToString());
-                        try
-                        {
-                            if (File.Exists(decodedSculptFileName))
-                            {
-                                idata = Image.FromFile(decodedSculptFileName);
-                            }
-                        }
-                        catch (Exception e)
-                        {
-                            m_log.Error("[SCULPT]: unable to load cached sculpt map " + decodedSculptFileName + " " + e.Message);
-
-                        }
-                        //if (idata != null)
-                        //    m_log.Debug("[SCULPT]: loaded cached map asset for map ID: " + primShape.SculptTexture.ToString());
+                        idata = Image.FromFile(decodedSculptFileName);
                     }
+                }
+                catch (Exception e)
+                {
+                    m_log.Error("[SCULPT]: unable to load cached sculpt map " + decodedSculptFileName + " " + e.Message);
+
+                }
+                //if (idata != null)
+                //    m_log.Debug("[SCULPT]: loaded cached map asset for map ID: " + primShape.SculptTexture.ToString());
+            }
+
+            if (idata == null)
+            {
+                if (primShape.SculptData == null || primShape.SculptData.Length == 0)
+                    return false;
+
+                try
+                {
+                    OpenMetaverse.Imaging.ManagedImage unusedData;
+                    OpenMetaverse.Imaging.OpenJPEG.DecodeToImage(primShape.SculptData, out unusedData, out idata);
 
                     if (idata == null)
                     {
-                        if (primShape.SculptData == null || primShape.SculptData.Length == 0)
-                            return null;
+                        // In some cases it seems that the decode can return a null bitmap without throwing
+                        // an exception
+                        m_log.WarnFormat("[PHYSICS]: OpenJPEG decoded sculpt data for {0} to a null bitmap.  Ignoring.", primName);
 
-                        try
-                        {
-                            OpenMetaverse.Imaging.ManagedImage unusedData;
-                            OpenMetaverse.Imaging.OpenJPEG.DecodeToImage(primShape.SculptData, out unusedData, out idata);
-                            unusedData = null;
+                        return false;
+                    }
 
-                            //idata = CSJ2K.J2kImage.FromBytes(primShape.SculptData);
+                    unusedData = null;
 
-                            if (cacheSculptMaps && idata != null)
-                            {
-                                try { idata.Save(decodedSculptFileName, ImageFormat.MemoryBmp); }
-                                catch (Exception e) { m_log.Error("[SCULPT]: unable to cache sculpt map " + decodedSculptFileName + " " + e.Message); }
-                            }
-                        }
-                        catch (DllNotFoundException)
-                        {
-                            m_log.Error("[PHYSICS]: OpenJpeg is not installed correctly on this system. Physics Proxy generation failed.  Often times this is because of an old version of GLIBC.  You must have version 2.4 or above!");
-                            return null;
-                        }
-                        catch (IndexOutOfRangeException)
-                        {
-                            m_log.Error("[PHYSICS]: OpenJpeg was unable to decode this. Physics Proxy generation failed");
-                            return null;
-                        }
-                        catch (Exception ex)
-                        {
-                            m_log.Error("[PHYSICS]: Unable to generate a Sculpty physics proxy. Sculpty texture decode failed: " + ex.Message);
-                            return null;
-                        }
-                    }
+                    //idata = CSJ2K.J2kImage.FromBytes(primShape.SculptData);
 
-                    PrimMesher.SculptMesh.SculptType sculptType;
-                    switch ((OpenMetaverse.SculptType)primShape.SculptType)
+                    if (cacheSculptMaps)
                     {
-                        case OpenMetaverse.SculptType.Cylinder:
-                            sculptType = PrimMesher.SculptMesh.SculptType.cylinder;
-                            break;
-                        case OpenMetaverse.SculptType.Plane:
-                            sculptType = PrimMesher.SculptMesh.SculptType.plane;
-                            break;
-                        case OpenMetaverse.SculptType.Torus:
-                            sculptType = PrimMesher.SculptMesh.SculptType.torus;
-                            break;
-                        case OpenMetaverse.SculptType.Sphere:
-                            sculptType = PrimMesher.SculptMesh.SculptType.sphere;
-                            break;
-                        default:
-                            sculptType = PrimMesher.SculptMesh.SculptType.plane;
-                            break;
+                        try { idata.Save(decodedSculptFileName, ImageFormat.MemoryBmp); }
+                        catch (Exception e) { m_log.Error("[SCULPT]: unable to cache sculpt map " + decodedSculptFileName + " " + e.Message); }
                     }
+                }
+                catch (DllNotFoundException)
+                {
+                    m_log.Error("[PHYSICS]: OpenJpeg is not installed correctly on this system. Physics Proxy generation failed.  Often times this is because of an old version of GLIBC.  You must have version 2.4 or above!");
+                    return false;
+                }
+                catch (IndexOutOfRangeException)
+                {
+                    m_log.Error("[PHYSICS]: OpenJpeg was unable to decode this. Physics Proxy generation failed");
+                    return false;
+                }
+                catch (Exception ex)
+                {
+                    m_log.Error("[PHYSICS]: Unable to generate a Sculpty physics proxy. Sculpty texture decode failed: " + ex.Message);
+                    return false;
+                }
+            }
+
+            PrimMesher.SculptMesh.SculptType sculptType;
+            switch ((OpenMetaverse.SculptType)primShape.SculptType)
+            {
+                case OpenMetaverse.SculptType.Cylinder:
+                    sculptType = PrimMesher.SculptMesh.SculptType.cylinder;
+                    break;
+                case OpenMetaverse.SculptType.Plane:
+                    sculptType = PrimMesher.SculptMesh.SculptType.plane;
+                    break;
+                case OpenMetaverse.SculptType.Torus:
+                    sculptType = PrimMesher.SculptMesh.SculptType.torus;
+                    break;
+                case OpenMetaverse.SculptType.Sphere:
+                    sculptType = PrimMesher.SculptMesh.SculptType.sphere;
+                    break;
+                default:
+                    sculptType = PrimMesher.SculptMesh.SculptType.plane;
+                    break;
+            }
 
-                    bool mirror = ((primShape.SculptType & 128) != 0);
-                    bool invert = ((primShape.SculptType & 64) != 0);
+            bool mirror = ((primShape.SculptType & 128) != 0);
+            bool invert = ((primShape.SculptType & 64) != 0);
 
-                    sculptMesh = new PrimMesher.SculptMesh((Bitmap)idata, sculptType, (int)lod, false, mirror, invert);
-                    
-                    idata.Dispose();
+            sculptMesh = new PrimMesher.SculptMesh((Bitmap)idata, sculptType, (int)lod, false, mirror, invert);
 
-                    sculptMesh.DumpRaw(baseDir, primName, "primMesh");
+            idata.Dispose();
 
-                    sculptMesh.Scale(size.X, size.Y, size.Z);
+            sculptMesh.DumpRaw(baseDir, primName, "primMesh");
 
-                    coords = sculptMesh.coords;
-                    faces = sculptMesh.faces;
+            sculptMesh.Scale(size.X, size.Y, size.Z);
+
+            coords = sculptMesh.coords;
+            faces = sculptMesh.faces;
+
+            return true;
+        }
+
+        /// <summary>
+        /// Generate the co-ords and faces necessary to construct a mesh from the shape data the accompanies a prim.
+        /// </summary>
+        /// <param name="primName"></param>
+        /// <param name="primShape"></param>
+        /// <param name="size"></param>
+        /// <param name="coords">Coords are added to this list by the method.</param>
+        /// <param name="faces">Faces are added to this list by the method.</param>
+        /// <returns>true if coords and faces were successfully generated, false if not</returns>
+        private bool GenerateCoordsAndFacesFromPrimShapeData(
+            string primName, PrimitiveBaseShape primShape, Vector3 size, float lod, out List<Coord> coords, out List<Face> faces)
+        {
+            PrimMesh primMesh;
+            coords = new List<Coord>();
+            faces = new List<Face>();            
+
+            float pathShearX = primShape.PathShearX < 128 ? (float)primShape.PathShearX * 0.01f : (float)(primShape.PathShearX - 256) * 0.01f;
+            float pathShearY = primShape.PathShearY < 128 ? (float)primShape.PathShearY * 0.01f : (float)(primShape.PathShearY - 256) * 0.01f;
+            float pathBegin = (float)primShape.PathBegin * 2.0e-5f;
+            float pathEnd = 1.0f - (float)primShape.PathEnd * 2.0e-5f;
+            float pathScaleX = (float)(primShape.PathScaleX - 100) * 0.01f;
+            float pathScaleY = (float)(primShape.PathScaleY - 100) * 0.01f;
+
+            float profileBegin = (float)primShape.ProfileBegin * 2.0e-5f;
+            float profileEnd = 1.0f - (float)primShape.ProfileEnd * 2.0e-5f;
+            float profileHollow = (float)primShape.ProfileHollow * 2.0e-5f;
+            if (profileHollow > 0.95f)
+                profileHollow = 0.95f;
+
+            int sides = 4;
+            LevelOfDetail iLOD = (LevelOfDetail)lod;
+            if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.EquilateralTriangle)
+                sides = 3;
+            else if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.Circle)
+            {
+                switch (iLOD)
+                {
+                    case LevelOfDetail.High:    sides = 24;     break;
+                    case LevelOfDetail.Medium:  sides = 12;     break;
+                    case LevelOfDetail.Low:     sides = 6;      break;
+                    case LevelOfDetail.VeryLow: sides = 3;      break;
+                    default:                    sides = 24;     break;
                 }
             }
-            else
+            else if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.HalfCircle)
+            { // half circle, prim is a sphere
+                switch (iLOD)
+                {
+                    case LevelOfDetail.High:    sides = 24;     break;
+                    case LevelOfDetail.Medium:  sides = 12;     break;
+                    case LevelOfDetail.Low:     sides = 6;      break;
+                    case LevelOfDetail.VeryLow: sides = 3;      break;
+                    default:                    sides = 24;     break;
+                }
+
+                profileBegin = 0.5f * profileBegin + 0.5f;
+                profileEnd = 0.5f * profileEnd + 0.5f;
+            }
+
+            int hollowSides = sides;
+            if (primShape.HollowShape == HollowShape.Circle)
             {
-                float pathShearX = primShape.PathShearX < 128 ? (float)primShape.PathShearX * 0.01f : (float)(primShape.PathShearX - 256) * 0.01f;
-                float pathShearY = primShape.PathShearY < 128 ? (float)primShape.PathShearY * 0.01f : (float)(primShape.PathShearY - 256) * 0.01f;
-                float pathBegin = (float)primShape.PathBegin * 2.0e-5f;
-                float pathEnd = 1.0f - (float)primShape.PathEnd * 2.0e-5f;
-                float pathScaleX = (float)(primShape.PathScaleX - 100) * 0.01f;
-                float pathScaleY = (float)(primShape.PathScaleY - 100) * 0.01f;
-
-                float profileBegin = (float)primShape.ProfileBegin * 2.0e-5f;
-                float profileEnd = 1.0f - (float)primShape.ProfileEnd * 2.0e-5f;
-                float profileHollow = (float)primShape.ProfileHollow * 2.0e-5f;
-                if (profileHollow > 0.95f)
-                    profileHollow = 0.95f;
-
-                int sides = 4;
-                if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.EquilateralTriangle)
-                    sides = 3;
-                else if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.Circle)
-                    sides = 24;
-                else if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.HalfCircle)
-                { // half circle, prim is a sphere
-                    sides = 24;
-
-                    profileBegin = 0.5f * profileBegin + 0.5f;
-                    profileEnd = 0.5f * profileEnd + 0.5f;
+                switch (iLOD)
+                {
+                    case LevelOfDetail.High:    hollowSides = 24;     break;
+                    case LevelOfDetail.Medium:  hollowSides = 12;     break;
+                    case LevelOfDetail.Low:     hollowSides = 6;      break;
+                    case LevelOfDetail.VeryLow: hollowSides = 3;      break;
+                    default:                    hollowSides = 24;     break;
                 }
+            }
+            else if (primShape.HollowShape == HollowShape.Square)
+                hollowSides = 4;
+            else if (primShape.HollowShape == HollowShape.Triangle)
+                hollowSides = 3;
 
-                int hollowSides = sides;
-                if (primShape.HollowShape == HollowShape.Circle)
-                    hollowSides = 24;
-                else if (primShape.HollowShape == HollowShape.Square)
-                    hollowSides = 4;
-                else if (primShape.HollowShape == HollowShape.Triangle)
-                    hollowSides = 3;
+            primMesh = new PrimMesh(sides, profileBegin, profileEnd, profileHollow, hollowSides);
 
-                primMesh = new PrimMesh(sides, profileBegin, profileEnd, profileHollow, hollowSides);
+            if (primMesh.errorMessage != null)
+                if (primMesh.errorMessage.Length > 0)
+                    m_log.Error("[ERROR] " + primMesh.errorMessage);
 
-                if (primMesh.errorMessage != null)
-                    if (primMesh.errorMessage.Length > 0)
-                        m_log.Error("[ERROR] " + primMesh.errorMessage);
+            primMesh.topShearX = pathShearX;
+            primMesh.topShearY = pathShearY;
+            primMesh.pathCutBegin = pathBegin;
+            primMesh.pathCutEnd = pathEnd;
 
-                primMesh.topShearX = pathShearX;
-                primMesh.topShearY = pathShearY;
-                primMesh.pathCutBegin = pathBegin;
-                primMesh.pathCutEnd = pathEnd;
+            if (primShape.PathCurve == (byte)Extrusion.Straight || primShape.PathCurve == (byte) Extrusion.Flexible)
+            {
+                primMesh.twistBegin = primShape.PathTwistBegin * 18 / 10;
+                primMesh.twistEnd = primShape.PathTwist * 18 / 10;
+                primMesh.taperX = pathScaleX;
+                primMesh.taperY = pathScaleY;
 
-                if (primShape.PathCurve == (byte)Extrusion.Straight || primShape.PathCurve == (byte) Extrusion.Flexible)
+                if (profileBegin < 0.0f || profileBegin >= profileEnd || profileEnd > 1.0f)
                 {
-                    primMesh.twistBegin = primShape.PathTwistBegin * 18 / 10;
-                    primMesh.twistEnd = primShape.PathTwist * 18 / 10;
-                    primMesh.taperX = pathScaleX;
-                    primMesh.taperY = pathScaleY;
-
-                    if (profileBegin < 0.0f || profileBegin >= profileEnd || profileEnd > 1.0f)
-                    {
-                        ReportPrimError("*** CORRUPT PRIM!! ***", primName, primMesh);
-                        if (profileBegin < 0.0f) profileBegin = 0.0f;
-                        if (profileEnd > 1.0f) profileEnd = 1.0f;
-                    }
+                    ReportPrimError("*** CORRUPT PRIM!! ***", primName, primMesh);
+                    if (profileBegin < 0.0f) profileBegin = 0.0f;
+                    if (profileEnd > 1.0f) profileEnd = 1.0f;
+                }
 #if SPAM
-                m_log.Debug("****** PrimMesh Parameters (Linear) ******\n" + primMesh.ParamsToDisplayString());
+            m_log.Debug("****** PrimMesh Parameters (Linear) ******\n" + primMesh.ParamsToDisplayString());
 #endif
-                    try
-                    {
-                        primMesh.ExtrudeLinear();
-                    }
-                    catch (Exception ex)
-                    {
-                        ReportPrimError("Extrusion failure: exception: " + ex.ToString(), primName, primMesh);
-                        return null;
-                    }
+                try
+                {
+                    primMesh.ExtrudeLinear();
                 }
-                else
+                catch (Exception ex)
                 {
-                    primMesh.holeSizeX = (200 - primShape.PathScaleX) * 0.01f;
-                    primMesh.holeSizeY = (200 - primShape.PathScaleY) * 0.01f;
-                    primMesh.radius = 0.01f * primShape.PathRadiusOffset;
-                    primMesh.revolutions = 1.0f + 0.015f * primShape.PathRevolutions;
-                    primMesh.skew = 0.01f * primShape.PathSkew;
-                    primMesh.twistBegin = primShape.PathTwistBegin * 36 / 10;
-                    primMesh.twistEnd = primShape.PathTwist * 36 / 10;
-                    primMesh.taperX = primShape.PathTaperX * 0.01f;
-                    primMesh.taperY = primShape.PathTaperY * 0.01f;
-
-                    if (profileBegin < 0.0f || profileBegin >= profileEnd || profileEnd > 1.0f)
-                    {
-                        ReportPrimError("*** CORRUPT PRIM!! ***", primName, primMesh);
-                        if (profileBegin < 0.0f) profileBegin = 0.0f;
-                        if (profileEnd > 1.0f) profileEnd = 1.0f;
-                    }
+                    ReportPrimError("Extrusion failure: exception: " + ex.ToString(), primName, primMesh);
+                    return false;
+                }
+            }
+            else
+            {
+                primMesh.holeSizeX = (200 - primShape.PathScaleX) * 0.01f;
+                primMesh.holeSizeY = (200 - primShape.PathScaleY) * 0.01f;
+                primMesh.radius = 0.01f * primShape.PathRadiusOffset;
+                primMesh.revolutions = 1.0f + 0.015f * primShape.PathRevolutions;
+                primMesh.skew = 0.01f * primShape.PathSkew;
+                primMesh.twistBegin = primShape.PathTwistBegin * 36 / 10;
+                primMesh.twistEnd = primShape.PathTwist * 36 / 10;
+                primMesh.taperX = primShape.PathTaperX * 0.01f;
+                primMesh.taperY = primShape.PathTaperY * 0.01f;
+
+                if (profileBegin < 0.0f || profileBegin >= profileEnd || profileEnd > 1.0f)
+                {
+                    ReportPrimError("*** CORRUPT PRIM!! ***", primName, primMesh);
+                    if (profileBegin < 0.0f) profileBegin = 0.0f;
+                    if (profileEnd > 1.0f) profileEnd = 1.0f;
+                }
 #if SPAM
-                m_log.Debug("****** PrimMesh Parameters (Circular) ******\n" + primMesh.ParamsToDisplayString());
+            m_log.Debug("****** PrimMesh Parameters (Circular) ******\n" + primMesh.ParamsToDisplayString());
 #endif
-                    try
-                    {
-                        primMesh.ExtrudeCircular();
-                    }
-                    catch (Exception ex)
-                    {
-                        ReportPrimError("Extrusion failure: exception: " + ex.ToString(), primName, primMesh);
-                        return null;
-                    }
+                try
+                {
+                    primMesh.ExtrudeCircular();
+                }
+                catch (Exception ex)
+                {
+                    ReportPrimError("Extrusion failure: exception: " + ex.ToString(), primName, primMesh);
+                    return false;
                 }
-
-                primMesh.DumpRaw(baseDir, primName, "primMesh");
-
-                primMesh.Scale(size.X, size.Y, size.Z);
-
-                coords = primMesh.coords;
-                faces = primMesh.faces;
             }
 
-            // Remove the reference to any JPEG2000 sculpt data so it can be GCed
-            primShape.SculptData = Utils.EmptyBytes;
+            primMesh.DumpRaw(baseDir, primName, "primMesh");
 
-            int numCoords = coords.Count;
-            int numFaces = faces.Count;
-
-            // Create the list of vertices
-            List<Vertex> vertices = new List<Vertex>();
-            for (int i = 0; i < numCoords; i++)
-            {
-                Coord c = coords[i];
-                vertices.Add(new Vertex(c.X, c.Y, c.Z));
-            }
+            primMesh.Scale(size.X, size.Y, size.Z);
 
-            Mesh mesh = new Mesh();
-            // Add the corresponding triangles to the mesh
-            for (int i = 0; i < numFaces; i++)
-            {
-                Face f = faces[i];
-                mesh.Add(new Triangle(vertices[f.v1], vertices[f.v2], vertices[f.v3]));
-            }
+            coords = primMesh.coords;
+            faces = primMesh.faces;
 
-            return mesh;
+            return true;
         }
 
         public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod)
@@ -668,8 +716,7 @@ namespace OpenSim.Region.Physics.Meshing
 
             // If this mesh has been created already, return it instead of creating another copy
             // For large regions with 100k+ prims and hundreds of copies of each, this can save a GB or more of memory
-
-            key = GetMeshKey(primShape, size, lod);
+            key = primShape.GetMeshKey(size, lod);
             if (m_uniqueMeshes.TryGetValue(key, out mesh))
                 return mesh;