diff options
author | Justin Clark-Casey (justincc) | 2011-10-29 02:42:53 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-10-29 02:42:53 +0100 |
commit | 6d97545b6bdf1b9a468f9116fe3070c5d9f9f3c6 (patch) | |
tree | 2c54698c55cad641c39b22ba7d90991ffc013ea5 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | Add taint target velocity for ODECharacters as is already done for ODECharact... (diff) | |
download | opensim-SC-6d97545b6bdf1b9a468f9116fe3070c5d9f9f3c6.zip opensim-SC-6d97545b6bdf1b9a468f9116fe3070c5d9f9f3c6.tar.gz opensim-SC-6d97545b6bdf1b9a468f9116fe3070c5d9f9f3c6.tar.bz2 opensim-SC-6d97545b6bdf1b9a468f9116fe3070c5d9f9f3c6.tar.xz |
Remove the SyncRoot locking from Scene which was only being done around the main physics loop and ScenePresence position and velocity setting
This is no longer necessary with ODECharacter taints (ODEPrim was already not taking part in this). BSCharacter was already tainting.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 0880e21..bb820aa 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -521,8 +521,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
521 | { | 521 | { |
522 | try | 522 | try |
523 | { | 523 | { |
524 | lock (m_scene.SyncRoot) | 524 | PhysicsActor.Position = value; |
525 | PhysicsActor.Position = value; | ||
526 | } | 525 | } |
527 | catch (Exception e) | 526 | catch (Exception e) |
528 | { | 527 | { |
@@ -572,8 +571,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
572 | { | 571 | { |
573 | try | 572 | try |
574 | { | 573 | { |
575 | lock (m_scene.SyncRoot) | 574 | PhysicsActor.Velocity = value; |
576 | PhysicsActor.Velocity = value; | ||
577 | } | 575 | } |
578 | catch (Exception e) | 576 | catch (Exception e) |
579 | { | 577 | { |