OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

viewer-2-initial-appearance
opensim mirror account 2010-11-24 02:10:12 -08:00
parent a1daeb277e 9f29908f66
commit 181daf3a9d
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/Physics/Meshing/Meshmerizer.cs
View File

@ -276,7 +276,7 @@ namespace OpenSim.Region.Physics.Meshing
m_log.Debug("[MESH]: experimental mesh proxy generation"); m_log.Debug("[MESH]: experimental mesh proxy generation");
OSD meshOsd; OSD meshOsd = null;
if (primShape.SculptData.Length <= 0) if (primShape.SculptData.Length <= 0)
{ {
@ -286,8 +286,15 @@ namespace OpenSim.Region.Physics.Meshing
long start = 0; long start = 0;
using (MemoryStream data = new MemoryStream(primShape.SculptData)) using (MemoryStream data = new MemoryStream(primShape.SculptData))
{
try
{ {
meshOsd = (OSDMap)OSDParser.DeserializeLLSDBinary(data); meshOsd = (OSDMap)OSDParser.DeserializeLLSDBinary(data);
}
catch (Exception e)
{
m_log.Error("[MESH]: Exception deserializing mesh asset header:" + e.ToString());
}
start = data.Position; start = data.Position;
} }