diff options
| author | Melanie | 2011-12-14 08:57:55 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-14 08:57:55 +0000 |
| commit | 898549d13e94643afe45ce12f33351abd70d5333 (patch) | |
| tree | be293f849a7c82442435048d565622fae4d69980 /OpenSim/Region/Physics | |
| parent | Spin off terrain save into a new thread and make it so that it uses the old (diff) | |
| parent | Just adding a comment to SendFullUpdatToClient (diff) | |
| download | opensim-SC_OLD-898549d13e94643afe45ce12f33351abd70d5333.zip opensim-SC_OLD-898549d13e94643afe45ce12f33351abd70d5333.tar.gz opensim-SC_OLD-898549d13e94643afe45ce12f33351abd70d5333.tar.bz2 opensim-SC_OLD-898549d13e94643afe45ce12f33351abd70d5333.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Physics')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index 5b28e7c..c1a3e61 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
| @@ -391,11 +391,10 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 391 | space = d.HashSpaceCreate(IntPtr.Zero); | 391 | space = d.HashSpaceCreate(IntPtr.Zero); |
| 392 | 392 | ||
| 393 | contactgroup = d.JointGroupCreate(0); | 393 | contactgroup = d.JointGroupCreate(0); |
| 394 | //contactgroup | ||
| 395 | 394 | ||
| 396 | d.WorldSetAutoDisableFlag(world, false); | 395 | d.WorldSetAutoDisableFlag(world, false); |
| 396 | |||
| 397 | #if USE_DRAWSTUFF | 397 | #if USE_DRAWSTUFF |
| 398 | |||
| 399 | Thread viewthread = new Thread(new ParameterizedThreadStart(startvisualization)); | 398 | Thread viewthread = new Thread(new ParameterizedThreadStart(startvisualization)); |
| 400 | viewthread.Start(); | 399 | viewthread.Start(); |
| 401 | #endif | 400 | #endif |