From b4dcdffb5094c488a98acbe675b333c3bd4cc570 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Tue, 16 Mar 2010 11:50:22 -0700
Subject: Fixed several unhandled exceptions and performance issues with
 PrimitiveBaseShape.Textures. This really should be moved from a property to a
 method if it is going to decode a byte[] into a TextureEntry each time

---
 OpenSim/Framework/PrimitiveBaseShape.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 6a38278..9c2a4f9 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -227,8 +227,12 @@ namespace OpenSim.Framework
         {
             get
             {
-                //m_log.DebugFormat("[PRIMITIVE BASE SHAPE]: get m_textureEntry length {0}", m_textureEntry.Length);
-                return new Primitive.TextureEntry(m_textureEntry, 0, m_textureEntry.Length);
+                //m_log.DebugFormat("[SHAPE]: get m_textureEntry length {0}", m_textureEntry.Length);
+                try { return new Primitive.TextureEntry(m_textureEntry, 0, m_textureEntry.Length); }
+                catch { }
+
+                m_log.Warn("[SHAPE]: Failed to decode texture, length=" + ((m_textureEntry != null) ? m_textureEntry.Length : 0));
+                return new Primitive.TextureEntry(null);
             }
 
             set { m_textureEntry = value.GetBytes(); }
-- 
cgit v1.1