aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDahlia Trimble2009-05-29 08:57:10 +0000
committerDahlia Trimble2009-05-29 08:57:10 +0000
commit179724b4fcc063adb67556bcb5997b2de663e348 (patch)
treeeaecc9fef8441cd16dcd5109e6beaf22753a2ecc /OpenSim/Region
parentreinstate a hopefully more robust experimental decoded sculpt map caching scheme (diff)
downloadopensim-SC_OLD-179724b4fcc063adb67556bcb5997b2de663e348.zip
opensim-SC_OLD-179724b4fcc063adb67556bcb5997b2de663e348.tar.gz
opensim-SC_OLD-179724b4fcc063adb67556bcb5997b2de663e348.tar.bz2
opensim-SC_OLD-179724b4fcc063adb67556bcb5997b2de663e348.tar.xz
some clean up of sculpt map caching code
remove a redundant debug message
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs3
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs8
2 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 4446fa4..06c4d6b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2970,12 +2970,13 @@ namespace OpenSim.Region.Framework.Scenes
2970 // check if a previously decoded sculpt map has been cached 2970 // check if a previously decoded sculpt map has been cached
2971 if (File.Exists(System.IO.Path.Combine("j2kDecodeCache", "smap_" + part.Shape.SculptTexture.ToString()))) 2971 if (File.Exists(System.IO.Path.Combine("j2kDecodeCache", "smap_" + part.Shape.SculptTexture.ToString())))
2972 { 2972 {
2973 m_log.Debug("[SCULPT]: found cached sculpt map - calling AssetReceived");
2974 part.SculptTextureCallback(part.Shape.SculptTexture, null); 2973 part.SculptTextureCallback(part.Shape.SculptTexture, null);
2975 } 2974 }
2976 else 2975 else
2976 {
2977 m_scene.AssetService.Get( 2977 m_scene.AssetService.Get(
2978 part.Shape.SculptTexture.ToString(), part, AssetReceived); 2978 part.Shape.SculptTexture.ToString(), part, AssetReceived);
2979 }
2979 } 2980 }
2980 } 2981 }
2981 } 2982 }
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index f3e79c9..feeaf71 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -184,9 +184,6 @@ namespace OpenSim.Region.Physics.Meshing
184 184
185 if (primShape.SculptEntry) 185 if (primShape.SculptEntry)
186 { 186 {
187 //if (primShape.SculptData.Length == 0)
188 // return null;
189
190 if (cacheSculptMaps && primShape.SculptTexture != null) 187 if (cacheSculptMaps && primShape.SculptTexture != null)
191 { 188 {
192 decodedSculptFileName = System.IO.Path.Combine(decodedScultMapPath, "smap_" + primShape.SculptTexture.ToString()); 189 decodedSculptFileName = System.IO.Path.Combine(decodedScultMapPath, "smap_" + primShape.SculptTexture.ToString());
@@ -196,8 +193,6 @@ namespace OpenSim.Region.Physics.Meshing
196 { 193 {
197 idata = Image.FromFile(decodedSculptFileName); 194 idata = Image.FromFile(decodedSculptFileName);
198 } 195 }
199 else if (primShape.SculptData.Length == 0)
200 return null;
201 } 196 }
202 catch (Exception e) 197 catch (Exception e)
203 { 198 {
@@ -210,6 +205,9 @@ namespace OpenSim.Region.Physics.Meshing
210 205
211 if (idata == null) 206 if (idata == null)
212 { 207 {
208 if (primShape.SculptData.Length == 0)
209 return null;
210
213 try 211 try
214 { 212 {
215 ManagedImage managedImage; // we never use this 213 ManagedImage managedImage; // we never use this