Merge branch 'master' of /var/git/opensim/

1 files changed, 71 insertions, 71 deletions

diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index df44be3..3e3a0f0 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -30,10 +30,10 @@ using System;
 using System.Collections.Generic;
 using OpenSim.Framework;
 using OpenSim.Region.Physics.Manager;
-using OpenMetaverse;

+using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 using System.Drawing;
-using System.Drawing.Imaging;

+using System.Drawing.Imaging;
 using System.IO.Compression;
 using PrimMesher;
 using log4net;
@@ -266,75 +266,75 @@ namespace OpenSim.Region.Physics.Meshing
 
             if (primShape.SculptEntry)
             {
-                if (((OpenMetaverse.SculptType)primShape.SculptType) == SculptType.Mesh)

-                {

-                    // add code for mesh physics proxy generation here

-                    m_log.Debug("[MESH]: mesh proxy generation not implemented yet ");

-

-                    OSD meshOsd;

-

-                    if (primShape.SculptData.Length > 0)

-                    {

-                        

-                        

-                        m_log.Debug("[MESH]: asset data length: " + primShape.SculptData.Length.ToString());

-                        byte[] header = Util.StringToBytes256("<? LLSD/Binary ?>");

-

-                        ////dump to debugging file

-                        //string filename = System.IO.Path.Combine(decodedSculptMapPath, "mesh_" + primShape.SculptTexture.ToString());

-                        //BinaryWriter writer = new BinaryWriter(File.Open(filename, FileMode.Create));

-                        //writer.Write(primShape.SculptData);

-                        //writer.Close();

-

-                    }

-                    else

-                    {

-                        m_log.Error("[MESH]: asset data is zero length");

-                        return null;

-                    }

-

-                    try

-                    {

-                        meshOsd = OSDParser.DeserializeLLSDBinary(primShape.SculptData, true);

-                    }

-                    catch (Exception e)

-                    {

-                        m_log.Error("[MESH]: exception decoding mesh asset: " + e.ToString());

-                        return null;

-                    }

-

-                    if (meshOsd is OSDMap)

-                    {

-                        OSDMap map = (OSDMap)meshOsd;

-                        //foreach (string name in map.Keys)

-                        //    m_log.Debug("[MESH]: key:" + name + " value:" + map[name].AsString());

-                        OSDMap physicsParms = (OSDMap)map["physics_shape"];

-                        int physOffset = physicsParms["offset"].AsInteger();

-                        int physSize = physicsParms["size"].AsInteger();

-

-                        if (physOffset < 0 || physSize == 0)

-                            return null; // no mesh data in asset

-

-                        m_log.Debug("[MESH]: physOffset:" + physOffset.ToString() + " physSize:" + physSize.ToString());

-                        //MemoryStream ms = new MemoryStream(primShape.SculptData, physOffset, physSize);

-                        //GZipStream gzStream = new GZipStream(ms, CompressionMode.Decompress);

-                        

-                        //int maxSize = physSize * 5; // arbitrary guess

-                        //byte[] readBuffer = new byte[maxSize];

-

-                        //int bytesRead = gzStream.Read(readBuffer, 0, maxSize);

-

-                        //OSD physMeshOsd = OSDParser.DeserializeLLSDBinary(readBuffer);

-

-

-

-

-

-                    }

-

-                    //just bail out for now until mesh code is finished

-                    return null;

-

+                if (((OpenMetaverse.SculptType)primShape.SculptType) == SculptType.Mesh)
+                {
+                    // add code for mesh physics proxy generation here
+                    m_log.Debug("[MESH]: mesh proxy generation not implemented yet ");
+
+                    OSD meshOsd;
+
+                    if (primShape.SculptData.Length > 0)
+                    {
+                        
+                        
+                        m_log.Debug("[MESH]: asset data length: " + primShape.SculptData.Length.ToString());
+                        byte[] header = Util.StringToBytes256("<? LLSD/Binary ?>");
+
+                        ////dump to debugging file
+                        //string filename = System.IO.Path.Combine(decodedSculptMapPath, "mesh_" + primShape.SculptTexture.ToString());
+                        //BinaryWriter writer = new BinaryWriter(File.Open(filename, FileMode.Create));
+                        //writer.Write(primShape.SculptData);
+                        //writer.Close();
+
+                    }
+                    else
+                    {
+                        m_log.Error("[MESH]: asset data is zero length");
+                        return null;
+                    }
+
+                    try
+                    {
+                        meshOsd = OSDParser.DeserializeLLSDBinary(primShape.SculptData, true);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.Error("[MESH]: exception decoding mesh asset: " + e.ToString());
+                        return null;
+                    }
+
+                    if (meshOsd is OSDMap)
+                    {
+                        OSDMap map = (OSDMap)meshOsd;
+                        //foreach (string name in map.Keys)
+                        //    m_log.Debug("[MESH]: key:" + name + " value:" + map[name].AsString());
+                        OSDMap physicsParms = (OSDMap)map["physics_shape"];
+                        int physOffset = physicsParms["offset"].AsInteger();
+                        int physSize = physicsParms["size"].AsInteger();
+
+                        if (physOffset < 0 || physSize == 0)
+                            return null; // no mesh data in asset
+
+                        m_log.Debug("[MESH]: physOffset:" + physOffset.ToString() + " physSize:" + physSize.ToString());
+                        //MemoryStream ms = new MemoryStream(primShape.SculptData, physOffset, physSize);
+                        //GZipStream gzStream = new GZipStream(ms, CompressionMode.Decompress);
+                        
+                        //int maxSize = physSize * 5; // arbitrary guess
+                        //byte[] readBuffer = new byte[maxSize];
+
+                        //int bytesRead = gzStream.Read(readBuffer, 0, maxSize);
+
+                        //OSD physMeshOsd = OSDParser.DeserializeLLSDBinary(readBuffer);
+
+
+
+
+
+                    }
+
+                    //just bail out for now until mesh code is finished
+                    return null;
+
                 }
                 else
                 {