disable sculpt map caching until a better method of avoiding asset requests can be found

2 files changed, 7 insertions, 5 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index a60ae83..37ab581 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2967,10 +2967,10 @@ namespace OpenSim.Region.Framework.Scenes
                         {
                             if (part.Shape.SculptEntry && part.Shape.SculptTexture != UUID.Zero)
                             {
-                                // check if a previously decoded sculpt map has been cached
-                                if (File.Exists(System.IO.Path.Combine("j2kDecodeCache", "smap_" + part.Shape.SculptTexture.ToString())))
-                                    part.SculptTextureCallback(part.Shape.SculptTexture, null);
-                                else
+                                //// check if a previously decoded sculpt map has been cached
+                                //if (File.Exists(System.IO.Path.Combine("j2kDecodeCache", "smap_" + part.Shape.SculptTexture.ToString())))
+                                //    part.SculptTextureCallback(part.Shape.SculptTexture, null);
+                                //else
                                     m_scene.AssetService.Get(
                                         part.Shape.SculptTexture.ToString(), part, AssetReceived);
                             }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index e71ce00..093dd73 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2268,8 +2268,10 @@ if (m_shape != null) {
         {
             if (m_shape.SculptEntry)
             {
+                // commented out for sculpt map caching test - null could mean a cached sculpt map has been found
+                if (texture != null)
                 {
-                    if (texture != null)
+                    //if (texture != null)
                         m_shape.SculptData = texture.Data;
 
                     if (PhysActor != null)