diff options
| author | Dahlia Trimble | 2009-05-29 05:11:50 +0000 |
|---|---|---|
| committer | Dahlia Trimble | 2009-05-29 05:11:50 +0000 |
| commit | 1609e7eac0562cb011c8d29fb17f6062226f5c3a (patch) | |
| tree | f9dd6f15639411e78960724ad4fd49c479951c97 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | null test for texture assets when using cached sculpt map (diff) | |
| download | opensim-SC-1609e7eac0562cb011c8d29fb17f6062226f5c3a.zip opensim-SC-1609e7eac0562cb011c8d29fb17f6062226f5c3a.tar.gz opensim-SC-1609e7eac0562cb011c8d29fb17f6062226f5c3a.tar.bz2 opensim-SC-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/SceneObjectGroup.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 8 |
1 files changed, 4 insertions, 4 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 | } |