aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorDahlia Trimble2009-05-29 05:11:50 +0000
committerDahlia Trimble2009-05-29 05:11:50 +0000
commit1609e7eac0562cb011c8d29fb17f6062226f5c3a (patch)
treef9dd6f15639411e78960724ad4fd49c479951c97 /OpenSim/Region/Framework/Scenes
parentnull test for texture assets when using cached sculpt map (diff)
downloadopensim-SC_OLD-1609e7eac0562cb011c8d29fb17f6062226f5c3a.zip
opensim-SC_OLD-1609e7eac0562cb011c8d29fb17f6062226f5c3a.tar.gz
opensim-SC_OLD-1609e7eac0562cb011c8d29fb17f6062226f5c3a.tar.bz2
opensim-SC_OLD-1609e7eac0562cb011c8d29fb17f6062226f5c3a.tar.xz
disable sculpt map caching until a better method of avoiding asset requests can be found
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs8
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs4
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
2967 { 2967 {
2968 if (part.Shape.SculptEntry && part.Shape.SculptTexture != UUID.Zero) 2968 if (part.Shape.SculptEntry && part.Shape.SculptTexture != UUID.Zero)
2969 { 2969 {
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 part.SculptTextureCallback(part.Shape.SculptTexture, null); 2972 // part.SculptTextureCallback(part.Shape.SculptTexture, null);
2973 else 2973 //else
2974 m_scene.AssetService.Get( 2974 m_scene.AssetService.Get(
2975 part.Shape.SculptTexture.ToString(), part, AssetReceived); 2975 part.Shape.SculptTexture.ToString(), part, AssetReceived);
2976 } 2976 }
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) {
2268 { 2268 {
2269 if (m_shape.SculptEntry) 2269 if (m_shape.SculptEntry)
2270 { 2270 {
2271 // commented out for sculpt map caching test - null could mean a cached sculpt map has been found
2272 if (texture != null)
2271 { 2273 {
2272 if (texture != null) 2274 //if (texture != null)
2273 m_shape.SculptData = texture.Data; 2275 m_shape.SculptData = texture.Data;
2274 2276
2275 if (PhysActor != null) 2277 if (PhysActor != null)