diff options
| author | Dahlia Trimble | 2009-05-29 02:46:35 +0000 |
|---|---|---|
| committer | Dahlia Trimble | 2009-05-29 02:46:35 +0000 |
| commit | db4f8d129887cd4fdd5603918590b3c940191882 (patch) | |
| tree | 1bc01eb0e30135b30e0dcdbefad680b5af575109 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | Making the delegate handlers async in async Get, to make things consistent. T... (diff) | |
| download | opensim-SC-db4f8d129887cd4fdd5603918590b3c940191882.zip opensim-SC-db4f8d129887cd4fdd5603918590b3c940191882.tar.gz opensim-SC-db4f8d129887cd4fdd5603918590b3c940191882.tar.bz2 opensim-SC-db4f8d129887cd4fdd5603918590b3c940191882.tar.xz | |
Experimental decoded sculpt map caching
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 8 |
1 files changed, 6 insertions, 2 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 | } |