* Don't fail the archive operation if exceptions are encountered while analyzing prims

0.6.0-stable
Justin Clarke Casey 2008-07-08 17:58:45 +00:00
parent 00a38df75a
commit 79f68e571f
1 changed files with 45 additions and 37 deletions

View File

@ -31,6 +31,7 @@ using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Environment.Modules.World.Serialiser; using OpenSim.Region.Environment.Modules.World.Serialiser;
using OpenSim.Region.Environment.Modules.World.Terrain; using OpenSim.Region.Environment.Modules.World.Terrain;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Scenes;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Reflection; using System.Reflection;
//using System.Text; //using System.Text;
@ -205,6 +206,8 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
m_log.DebugFormat( m_log.DebugFormat(
"[ARCHIVER]: Getting part {0}, {1} for object {2}", part.Name, part.UUID, sceneObject.UUID); "[ARCHIVER]: Getting part {0}, {1} for object {2}", part.Name, part.UUID, sceneObject.UUID);
try
{
LLObject.TextureEntry textureEntry = part.Shape.Textures; LLObject.TextureEntry textureEntry = part.Shape.Textures;
// Get the prim's default texture. This will be used for faces which don't have their own texture // Get the prim's default texture. This will be used for faces which don't have their own texture
@ -249,6 +252,11 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
} }
} }
} }
catch (Exception e)
{
m_log.ErrorFormat("[ARCHIVER]: Failed to get part - {0}", e);
}
}
} }
public void ArchiveRegion() public void ArchiveRegion()