diff options
author | Justin Clark-Casey (justincc) | 2011-07-09 00:35:30 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-07-09 00:35:30 +0100 |
commit | 5e8900dfd058bd103cb6dcf8a57dc94683efd878 (patch) | |
tree | a9962c79801fd6a3181fb72d026ae84e5c1097cd /OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |
parent | When loading library asset set, only store an asset if it's different from an... (diff) | |
download | opensim-SC_OLD-5e8900dfd058bd103cb6dcf8a57dc94683efd878.zip opensim-SC_OLD-5e8900dfd058bd103cb6dcf8a57dc94683efd878.tar.gz opensim-SC_OLD-5e8900dfd058bd103cb6dcf8a57dc94683efd878.tar.bz2 opensim-SC_OLD-5e8900dfd058bd103cb6dcf8a57dc94683efd878.tar.xz |
minor: code tidy and inserted log lines for future use.
Unable to get to the bottom of why resizing a mesh fails to properly reset the physics proxy, when toggling phantom does
After a mesh is generated, the existing sculptdata is set to zero in PrimitiveBaseShape to save memory
When phantom is toggled, the sculptdata is regenerated before remeshing.
But on resize, the sculptdata is not regenerated.
So clearly, resetting sculptdata is possible, but haven't quite been able to pin down how this is being done when phantom is toggled.
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/OdeScene.cs')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index 87d22af..f5172aa 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; |
@@ -312,7 +312,6 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
312 | #endif | 312 | #endif |
313 | } | 313 | } |
314 | 314 | ||
315 | |||
316 | _watermap = new float[258 * 258]; | 315 | _watermap = new float[258 * 258]; |
317 | 316 | ||
318 | // Zero out the prim spaces array (we split our space into smaller spaces so | 317 | // Zero out the prim spaces array (we split our space into smaller spaces so |
@@ -2563,7 +2562,6 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2563 | if (pbs.SculptEntry && meshSculptedPrim) | 2562 | if (pbs.SculptEntry && meshSculptedPrim) |
2564 | iPropertiesNotSupportedDefault++; | 2563 | iPropertiesNotSupportedDefault++; |
2565 | 2564 | ||
2566 | |||
2567 | if (iPropertiesNotSupportedDefault == 0) | 2565 | if (iPropertiesNotSupportedDefault == 0) |
2568 | { | 2566 | { |
2569 | #if SPAM | 2567 | #if SPAM |
@@ -2703,7 +2701,6 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2703 | { | 2701 | { |
2704 | foreach (OdeCharacter character in _taintedActors) | 2702 | foreach (OdeCharacter character in _taintedActors) |
2705 | { | 2703 | { |
2706 | |||
2707 | character.ProcessTaints(timeStep); | 2704 | character.ProcessTaints(timeStep); |
2708 | 2705 | ||
2709 | processedtaints = true; | 2706 | processedtaints = true; |