diff options
author | Justin Clark-Casey (justincc) | 2011-07-11 03:13:59 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-07-11 03:13:59 +0100 |
commit | 2f3d0e209ff5c3028e3e29179b67504be9b2f887 (patch) | |
tree | 4b7cdf49546018fc078bf3889022e0859c24418b /OpenSim/Region/Physics/OdePlugin | |
parent | comment out accidential ProcessTaints physics debug line left in code (diff) | |
download | opensim-SC_OLD-2f3d0e209ff5c3028e3e29179b67504be9b2f887.zip opensim-SC_OLD-2f3d0e209ff5c3028e3e29179b67504be9b2f887.tar.gz opensim-SC_OLD-2f3d0e209ff5c3028e3e29179b67504be9b2f887.tar.bz2 opensim-SC_OLD-2f3d0e209ff5c3028e3e29179b67504be9b2f887.tar.xz |
When a sculpt/mesh texture is received by a part on a callback request, don't do the unnecessary work of copying the base shape.
Just setting the new base shape is enough to reinsert the sculpt data and set the taint.
Also cleans up a few more left-in debugging messages.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 0cf2f5d..123c8ff 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -2104,6 +2104,7 @@ Console.WriteLine("changeshape not need meshing"); | |||
2104 | parent.ChildSetGeom(this); | 2104 | parent.ChildSetGeom(this); |
2105 | } | 2105 | } |
2106 | } | 2106 | } |
2107 | |||
2107 | resetCollisionAccounting(); | 2108 | resetCollisionAccounting(); |
2108 | m_taintshape = false; | 2109 | m_taintshape = false; |
2109 | } | 2110 | } |
@@ -2343,7 +2344,7 @@ Console.WriteLine("changeshape not need meshing"); | |||
2343 | { | 2344 | { |
2344 | lock (_parent_scene.OdeLock) | 2345 | lock (_parent_scene.OdeLock) |
2345 | { | 2346 | { |
2346 | m_isVolumeDetect = (param!=0); | 2347 | m_isVolumeDetect = (param != 0); |
2347 | } | 2348 | } |
2348 | } | 2349 | } |
2349 | 2350 | ||
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index f5172aa..99392cc 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
@@ -26,7 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | //#define USE_DRAWSTUFF | 28 | //#define USE_DRAWSTUFF |
29 | #define SPAM | 29 | //#define SPAM |
30 | 30 | ||
31 | using System; | 31 | using System; |
32 | using System.Collections.Generic; | 32 | using System.Collections.Generic; |