Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current

Conflicts:
	bin/Regions/Regions.ini.example

1 files changed, 9 insertions, 6 deletions

diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs
index 2027ca6..30e99b0 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs
@@ -26,9 +26,11 @@
  */
 
 using System;
+using System.Threading;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.ScriptEngine.Shared;
 
 namespace OpenSim.Region.ScriptEngine.Interfaces
 {
@@ -38,11 +40,12 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         /// Initialize the API
         /// </summary>
         /// <remarks>
-        /// Each API has an identifier, which is used to load the
-        /// proper runtime assembly at load time.
-        /// <param name='engine'>/param>
-        /// <param name='part'></param>
-        /// <param name='item'></param>
-        void Initialize(IScriptEngine engine, SceneObjectPart part, TaskInventoryItem item);
+        /// Each API has an identifier, which is used to load the proper runtime assembly at load time.
+        /// <param name='scriptEngine'>/param>
+        /// <param name='host'>/param>
+        /// <param name='item'>/param>
+        /// <param name='coopSleepHandle'>/param>
+        void Initialize(
+            IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle);
     }
 }
\ No newline at end of file