aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTeravus Ovares2007-11-14 16:24:19 +0000
committerTeravus Ovares2007-11-14 16:24:19 +0000
commitd8fde94843c64ee99a33c9323b611702d2b64d85 (patch)
tree8863814583cbcf0d3daa68b2bf6476ac0854a1cc /OpenSim
parent* Removes the console enumeration errors on sim start. (diff)
downloadopensim-SC-d8fde94843c64ee99a33c9323b611702d2b64d85.zip
opensim-SC-d8fde94843c64ee99a33c9323b611702d2b64d85.tar.gz
opensim-SC-d8fde94843c64ee99a33c9323b611702d2b64d85.tar.bz2
opensim-SC-d8fde94843c64ee99a33c9323b611702d2b64d85.tar.xz
* ODE removes an unnecessary lock.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs5
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 808f7c2..05604c3 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1589,8 +1589,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1589 // Sim resources and memory. 1589 // Sim resources and memory.
1590 // Disables the prim's movement physics.... 1590 // Disables the prim's movement physics....
1591 // It's a hack and will generate a console message if it fails. 1591 // It's a hack and will generate a console message if it fails.
1592 lock (OdeScene.OdeLock) 1592
1593 {
1594 try 1593 try
1595 { 1594 {
1596 disableBody(); 1595 disableBody();
@@ -1605,7 +1604,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1605 1604
1606 } 1605 }
1607 } 1606 }
1608 } 1607
1609 1608
1610 IsPhysical = false; 1609 IsPhysical = false;
1611 _velocity.X = 0; 1610 _velocity.X = 0;