aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2010-07-19 08:07:37 -0700
committerDiva Canto2010-07-20 13:25:53 -0700
commit5a8ddfe21144aef54ba3f77b665a8f2a20ecbda4 (patch)
tree8a7d868cda9084affbaeac027892f1aa5e8da0b5 /OpenSim
parentre-add the sleep lost in the revert. (diff)
downloadopensim-SC_OLD-5a8ddfe21144aef54ba3f77b665a8f2a20ecbda4.zip
opensim-SC_OLD-5a8ddfe21144aef54ba3f77b665a8f2a20ecbda4.tar.gz
opensim-SC_OLD-5a8ddfe21144aef54ba3f77b665a8f2a20ecbda4.tar.bz2
opensim-SC_OLD-5a8ddfe21144aef54ba3f77b665a8f2a20ecbda4.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')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs1
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index c5a4cf6..3519d4b 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 }