diff options
author | Justin Clark-Casey (justincc) | 2012-04-03 05:50:13 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-04-03 05:51:38 +0100 |
commit | 746829967315cc82560a855a4772e45888bf8fbe (patch) | |
tree | 1e21d5c27101cb505a4ac4bcdf6e356f2e409d52 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Implement bulk inventory update over CAPS (not recursive by design, (diff) | |
download | opensim-SC_OLD-746829967315cc82560a855a4772e45888bf8fbe.zip opensim-SC_OLD-746829967315cc82560a855a4772e45888bf8fbe.tar.gz opensim-SC_OLD-746829967315cc82560a855a4772e45888bf8fbe.tar.bz2 opensim-SC_OLD-746829967315cc82560a855a4772e45888bf8fbe.tar.xz |
Eliminate race condition where many callers would check SOP.PhysicsActor != null then assume it was still not null in later code.
Another thread could come and turn off physics for a part (null PhysicsActor) at any point.
Had to turn off localCopy on warp3D CoreModules section in prebuild.xml since on current nant this copies all DLLs in bin/ which can be a very large number with compiled DLLs
No obvious reason for doing that copy - nothing else does it.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 06f7c0f..29825a2 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -642,10 +642,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
642 | 642 | ||
643 | #endregion Region Settings | 643 | #endregion Region Settings |
644 | 644 | ||
645 | MainConsole.Instance.Commands.AddCommand("Estates", false, "reload estate", | ||
646 | "reload estate", | ||
647 | "Reload the estate data", HandleReloadEstate); | ||
648 | |||
649 | //Bind Storage Manager functions to some land manager functions for this scene | 645 | //Bind Storage Manager functions to some land manager functions for this scene |
650 | EventManager.OnLandObjectAdded += | 646 | EventManager.OnLandObjectAdded += |
651 | new EventManager.LandObjectAdded(simDataService.StoreLandObject); | 647 | new EventManager.LandObjectAdded(simDataService.StoreLandObject); |