diff options
| author | Diva Canto | 2010-07-19 08:07:37 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-07-19 08:07:37 -0700 |
| commit | cd2bb7daf33ef57dfb2057a67663428a36adec0a (patch) | |
| tree | 1e5f584b01155c804bbef8e6213eb092467d5880 /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |
| parent | re-add the sleep lost in the revert. (diff) | |
| download | opensim-SC-cd2bb7daf33ef57dfb2057a67663428a36adec0a.zip opensim-SC-cd2bb7daf33ef57dfb2057a67663428a36adec0a.tar.gz opensim-SC-cd2bb7daf33ef57dfb2057a67663428a36adec0a.tar.bz2 opensim-SC-cd2bb7daf33ef57dfb2057a67663428a36adec0a.tar.xz | |
Deleted Snoopy's patch completely, including Thread.Sleep. Preliminary tests indicate that this is what causes deadlock. More tests needed.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index a6d2f76..b27dc59 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
| @@ -201,7 +201,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 201 | if ((int)InventoryType.LSL == item.InvType) | 201 | if ((int)InventoryType.LSL == item.InvType) |
| 202 | { | 202 | { |
| 203 | CreateScriptInstance(item, startParam, postOnRez, engine, stateSource); | 203 | CreateScriptInstance(item, startParam, postOnRez, engine, stateSource); |
| 204 | Thread.Sleep(10); // workaround for Mono cpu utilization > 100% bug | ||
| 205 | } | 204 | } |
| 206 | } | 205 | } |
| 207 | } | 206 | } |