From 05cbf0b502f65ebae5330e4db27fc8cf85a83b48 Mon Sep 17 00:00:00 2001
From: Dahlia Trimble
Date: Fri, 29 May 2009 06:50:15 +0000
Subject: reinstate a hopefully more robust experimental decoded sculpt map
 caching scheme

---
 OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Physics')

diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 6832507..f3e79c9 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -71,7 +71,7 @@ namespace OpenSim.Region.Physics.Meshing
         private const string baseDir = null; //"rawFiles";
 #endif
 
-        private bool cacheSculptMaps = false;
+        private bool cacheSculptMaps = true;
         private string decodedScultMapPath = "j2kDecodeCache";
 
         private float minSizeForComplexMesh = 0.2f; // prims with all dimensions smaller than this will have a bounding box mesh
@@ -184,8 +184,8 @@ namespace OpenSim.Region.Physics.Meshing
 
             if (primShape.SculptEntry)
             {
-                if (primShape.SculptData.Length == 0)
-                    return null;
+                //if (primShape.SculptData.Length == 0)
+                //    return null;
 
                 if (cacheSculptMaps && primShape.SculptTexture != null)
                 {
@@ -196,6 +196,8 @@ namespace OpenSim.Region.Physics.Meshing
                         {
                             idata = Image.FromFile(decodedSculptFileName);
                         }
+                        else if (primShape.SculptData.Length == 0)
+                            return null;
                     }
                     catch (Exception e)
                     {
-- 
cgit v1.1