aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorDahlia Trimble2009-05-29 02:46:35 +0000
committerDahlia Trimble2009-05-29 02:46:35 +0000
commitdb4f8d129887cd4fdd5603918590b3c940191882 (patch)
tree1bc01eb0e30135b30e0dcdbefad680b5af575109 /OpenSim/Region/Framework/Scenes
parentMaking the delegate handlers async in async Get, to make things consistent. T... (diff)
downloadopensim-SC_OLD-db4f8d129887cd4fdd5603918590b3c940191882.zip
opensim-SC_OLD-db4f8d129887cd4fdd5603918590b3c940191882.tar.gz
opensim-SC_OLD-db4f8d129887cd4fdd5603918590b3c940191882.tar.bz2
opensim-SC_OLD-db4f8d129887cd4fdd5603918590b3c940191882.tar.xz
Experimental decoded sculpt map caching
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs8
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs2
2 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index e0a50a1..a60ae83 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2967,8 +2967,12 @@ 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 m_scene.AssetService.Get( 2970 // check if a previously decoded sculpt map has been cached
2971 part.Shape.SculptTexture.ToString(), part, AssetReceived); 2971 if (File.Exists(System.IO.Path.Combine("j2kDecodeCache", "smap_" + part.Shape.SculptTexture.ToString())))
2972 part.SculptTextureCallback(part.Shape.SculptTexture, null);
2973 else
2974 m_scene.AssetService.Get(
2975 part.Shape.SculptTexture.ToString(), part, AssetReceived);
2972 } 2976 }
2973 } 2977 }
2974 } 2978 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 719b028..7065d2f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2268,7 +2268,7 @@ if (m_shape != null) {
2268 { 2268 {
2269 if (m_shape.SculptEntry) 2269 if (m_shape.SculptEntry)
2270 { 2270 {
2271 if (texture != null) 2271 //if (texture != null) // null could mean a cached sculpt map has been found
2272 { 2272 {
2273 m_shape.SculptData = texture.Data; 2273 m_shape.SculptData = texture.Data;
2274 if (PhysActor != null) 2274 if (PhysActor != null)