2 files changed, 25 insertions, 7 deletions

diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 786288b..602a3c8 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -71,12 +71,28 @@ namespace OpenSim.Region.ScriptEngine.Common
             m_itemID = itemID;
 
             //m_log.Info(ScriptEngineName, "LSL_BaseClass.Start() called. Hosted by [" + m_host.Name + ":" + m_host.UUID + "@" + m_host.AbsolutePosition + "]");
+
+            IConfigSource config = new IniConfigSource(Application.iniFilePath);
+            if (config.Configs["LL-Functions"] == null)
+                config.AddConfig("LL-Functions");
+
+            m_delayFactor = config.Configs["LL-Functions"].GetFloat("ScriptDelayFactor", 1.0f);
+
         }
 
         private DateTime m_timer = DateTime.Now;
         private string m_state = "default";
         private bool m_waitingForScriptAnswer=false;
+        private float m_delayFactor = 1.0f;
+
 
+        private void ScriptSleep(int delay)
+        {
+            delay = (int)((float)delay * m_delayFactor);
+            if(delay == 0)
+                return;
+            System.Threading.Thread.Sleep(delay);
+        }
 
         public string State
         {
@@ -1613,7 +1629,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             SetPos(m_host, pos);
 
             // sleep for 0.2 seconds
-            System.Threading.Thread.Sleep(200);
+            ScriptSleep(200);
         }
 
         private void SetPos(SceneObjectPart part, LSL_Types.Vector3 pos)
@@ -1660,7 +1676,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             SetRot(m_host, rot);
 
             // sleep for 0.2 seconds
-            System.Threading.Thread.Sleep(200);
+            ScriptSleep(200);
         }
 
         private void SetRot(SceneObjectPart part, LSL_Types.Quaternion rot)
@@ -2290,7 +2306,7 @@ namespace OpenSim.Region.ScriptEngine.Common
                     llApplyImpulse(new LSL_Types.Vector3(llvel.X * groupmass, llvel.Y * groupmass, llvel.Z * groupmass), 0);
                     found = true;
                     //script delay
-                    System.Threading.Thread.Sleep((int)((groupmass * velmag) / 10));
+                    ScriptSleep((int)((groupmass * velmag) / 10));
                     break;
                 }
             }
@@ -2325,7 +2341,7 @@ namespace OpenSim.Region.ScriptEngine.Common
         public void llSleep(double sec)
         {
             m_host.AddScriptLPS((int)(sec * 100));
-            Thread.Sleep((int)(sec * 1000));
+            System.Threading.Thread.Sleep((int)(sec * 1000));
         }
 
         public double llGetMass()
@@ -2917,7 +2933,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             parentPrim.GetProperties(client);
 
             // sleep for 1 second
-            System.Threading.Thread.Sleep(1000);
+            ScriptSleep(1000);
 
         }
 
@@ -5268,7 +5284,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             // the rest of the permission checks are done in RezScript, so check the pin there as well
             World.RezScript(srcId, m_host, destId, pin, running, start_param);
             // this will cause the delay even if the script pin or permissions were wrong - seems ok
-            System.Threading.Thread.Sleep(3000);
+            ScriptSleep(3000);
         }
 
         //  remote_data(integer type, key channel, key message_id, string sender, integer ival, string sval)
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index f0e7d5f..e4b9c51 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -528,6 +528,8 @@ AllowosConsoleCommand=false
 
 AllowGodFunctions = false
 
+ScriptDelayFactor = 1.0
+
 ; Maximum number of llListen events we allow per script
 ; Set this to 0 to have no limit imposed.
 max_listens_per_script = 64
@@ -701,4 +703,4 @@ password = http://127.0.0.1/password
 ;These are the settings for the Open Grid Protocol..  the Agent Domain, Region Domain,   you know..  
 [OpenGridProtocol]
 ;On/true or Off/false
-ogp_enabled=false
\ No newline at end of file
+ogp_enabled=false