From 0ec89193fa9250d553e49e13af65f48e7592c150 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Tue, 22 Nov 2016 16:59:50 +1000
Subject: Actually tell us what the problem object is with sculpties in map
 generation.

---
 .../CoreModules/World/Warp3DMap/Warp3DImageModule.cs  | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/CoreModules')

diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
index 9fdef6a..383a67f 100644
--- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
@@ -444,12 +444,23 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                             IJ2KDecoder imgDecoder = m_scene.RequestModuleInterface<IJ2KDecoder>();
                             if (imgDecoder != null)
                             {
-                                Image sculpt = imgDecoder.DecodeToImage(sculptAsset);
-                                if (sculpt != null)
+                                try
                                 {
-                                    renderMesh = m_primMesher.GenerateFacetedSculptMesh(omvPrim, (Bitmap)sculpt,
+                                    Image sculpt = imgDecoder.DecodeToImage(sculptAsset);
+                                    if (sculpt != null)
+                                    {
+                                        renderMesh = m_primMesher.GenerateFacetedSculptMesh(omvPrim, (Bitmap)sculpt,
                                                                                         DetailLevel.Medium);
-                                    sculpt.Dispose();
+                                        sculpt.Dispose();
+                                    }
+                                }
+                                catch (Exception e)
+                                {
+                                    Vector3 objectPos = prim.ParentGroup.RootPart.AbsolutePosition;
+//// TODO - print out owner of SceneObjectPart prim.
+                                    m_log.Warn(string.Format("[WARP 3D IMAGE MODULE]: Failed to decode asset {0} @ {1},{2},{3} - {4}.",
+                                        omvPrim.Sculpt.SculptTexture, objectPos.X, objectPos.Y, objectPos.Z, 
+                                        prim.ParentGroup.RootPart.Name));
                                 }
                             }
                         }
-- 
cgit v1.1