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/SceneObjectPart.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/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 4 |
1 files changed, 3 insertions, 1 deletions
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) |