diff options
author | Dahlia Trimble | 2009-05-29 06:50:15 +0000 |
---|---|---|
committer | Dahlia Trimble | 2009-05-29 06:50:15 +0000 |
commit | 05cbf0b502f65ebae5330e4db27fc8cf85a83b48 (patch) | |
tree | a7b29b279bf79497623f7fab82fea9fc695475f2 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
parent | plumbing for future sculpt map caching (diff) | |
download | opensim-SC_OLD-05cbf0b502f65ebae5330e4db27fc8cf85a83b48.zip opensim-SC_OLD-05cbf0b502f65ebae5330e4db27fc8cf85a83b48.tar.gz opensim-SC_OLD-05cbf0b502f65ebae5330e4db27fc8cf85a83b48.tar.bz2 opensim-SC_OLD-05cbf0b502f65ebae5330e4db27fc8cf85a83b48.tar.xz |
reinstate a hopefully more robust experimental decoded sculpt map caching scheme
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 37ab581..4446fa4 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -2967,10 +2967,13 @@ 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 | { |
2973 | //else | 2973 | m_log.Debug("[SCULPT]: found cached sculpt map - calling AssetReceived"); |
2974 | part.SculptTextureCallback(part.Shape.SculptTexture, null); | ||
2975 | } | ||
2976 | else | ||
2974 | m_scene.AssetService.Get( | 2977 | m_scene.AssetService.Get( |
2975 | part.Shape.SculptTexture.ToString(), part, AssetReceived); | 2978 | part.Shape.SculptTexture.ToString(), part, AssetReceived); |
2976 | } | 2979 | } |
@@ -2982,10 +2985,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
2982 | 2985 | ||
2983 | protected void AssetReceived(string id, Object sender, AssetBase asset) | 2986 | protected void AssetReceived(string id, Object sender, AssetBase asset) |
2984 | { | 2987 | { |
2985 | if (asset != null) | 2988 | SceneObjectPart sop = (SceneObjectPart)sender; |
2989 | |||
2990 | if (sop != null) | ||
2986 | { | 2991 | { |
2987 | SceneObjectPart sop = (SceneObjectPart)sender; | 2992 | if (asset != null) |
2988 | if (sop != null) | ||
2989 | sop.SculptTextureCallback(asset.FullID, asset); | 2993 | sop.SculptTextureCallback(asset.FullID, asset); |
2990 | } | 2994 | } |
2991 | } | 2995 | } |