aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Meshing
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Physics/Meshing')
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs8
1 files changed, 5 insertions, 3 deletions
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
71 private const string baseDir = null; //"rawFiles"; 71 private const string baseDir = null; //"rawFiles";
72#endif 72#endif
73 73
74 private bool cacheSculptMaps = false; 74 private bool cacheSculptMaps = true;
75 private string decodedScultMapPath = "j2kDecodeCache"; 75 private string decodedScultMapPath = "j2kDecodeCache";
76 76
77 private float minSizeForComplexMesh = 0.2f; // prims with all dimensions smaller than this will have a bounding box mesh 77 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
184 184
185 if (primShape.SculptEntry) 185 if (primShape.SculptEntry)
186 { 186 {
187 if (primShape.SculptData.Length == 0) 187 //if (primShape.SculptData.Length == 0)
188 return null; 188 // return null;
189 189
190 if (cacheSculptMaps && primShape.SculptTexture != null) 190 if (cacheSculptMaps && primShape.SculptTexture != null)
191 { 191 {
@@ -196,6 +196,8 @@ namespace OpenSim.Region.Physics.Meshing
196 { 196 {
197 idata = Image.FromFile(decodedSculptFileName); 197 idata = Image.FromFile(decodedSculptFileName);
198 } 198 }
199 else if (primShape.SculptData.Length == 0)
200 return null;
199 } 201 }
200 catch (Exception e) 202 catch (Exception e)
201 { 203 {