aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDahlia Trimble2009-05-29 04:29:55 +0000
committerDahlia Trimble2009-05-29 04:29:55 +0000
commit9493de7f4e3123c5b9848db8263a850f226129f4 (patch)
tree8921254c98debbc5b424523c6fa0cae8af7d64e4 /OpenSim
parentExperimental decoded sculpt map caching (diff)
downloadopensim-SC_OLD-9493de7f4e3123c5b9848db8263a850f226129f4.zip
opensim-SC_OLD-9493de7f4e3123c5b9848db8263a850f226129f4.tar.gz
opensim-SC_OLD-9493de7f4e3123c5b9848db8263a850f226129f4.tar.bz2
opensim-SC_OLD-9493de7f4e3123c5b9848db8263a850f226129f4.tar.xz
null test for texture assets when using cached sculpt map
addresses mantis #3735
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 7065d2f..e71ce00 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2268,9 +2268,10 @@ if (m_shape != null) {
2268 { 2268 {
2269 if (m_shape.SculptEntry) 2269 if (m_shape.SculptEntry)
2270 { 2270 {
2271 //if (texture != null) // null could mean a cached sculpt map has been found
2272 { 2271 {
2273 m_shape.SculptData = texture.Data; 2272 if (texture != null)
2273 m_shape.SculptData = texture.Data;
2274
2274 if (PhysActor != null) 2275 if (PhysActor != null)
2275 { 2276 {
2276 // Tricks physics engine into thinking we've changed the part shape. 2277 // Tricks physics engine into thinking we've changed the part shape.