aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2010-07-19 14:37:27 +0100
committerDiva Canto2010-07-20 13:25:35 -0700
commit128da70d15b4d432cd717939c112c1b8319d874d (patch)
treefaf81e486289b6babd0b5881b362a1596db2bf37 /OpenSim
parentRevert "Thank you, Snoopy, for a patch to reduce sim script startup CPU usage" (diff)
downloadopensim-SC_OLD-128da70d15b4d432cd717939c112c1b8319d874d.zip
opensim-SC_OLD-128da70d15b4d432cd717939c112c1b8319d874d.tar.gz
opensim-SC_OLD-128da70d15b4d432cd717939c112c1b8319d874d.tar.bz2
opensim-SC_OLD-128da70d15b4d432cd717939c112c1b8319d874d.tar.xz
re-add the sleep lost in the revert.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 866bb6e..c5a4cf6 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -31,6 +31,7 @@ using System.IO;
31using System.Collections.Generic; 31using System.Collections.Generic;
32using System.Collections; 32using System.Collections;
33using System.Reflection; 33using System.Reflection;
34using System.Threading;
34using OpenMetaverse; 35using OpenMetaverse;
35using log4net; 36using log4net;
36using OpenSim.Framework; 37using OpenSim.Framework;
@@ -200,6 +201,7 @@ namespace OpenSim.Region.Framework.Scenes
200 if ((int)InventoryType.LSL == item.InvType) 201 if ((int)InventoryType.LSL == item.InvType)
201 { 202 {
202 CreateScriptInstance(item, startParam, postOnRez, engine, stateSource); 203 CreateScriptInstance(item, startParam, postOnRez, engine, stateSource);
204 Thread.Sleep(10); // workaround for Mono cpu utilization > 100% bug
203 } 205 }
204 } 206 }
205 } 207 }