Pass narrower WaitHandle rather than EventWaitHandle as co-op termination wait handle to script APIs.

APIs don't need to reference any methods on EventWaitHandle
author: Justin Clark-Casey (justincc) 2013-01-23 23:38:08 +0000
committer: Justin Clark-Casey (justincc) 2013-01-23 23:38:08 +0000
commit: 8a22ac3f94a3b8275d794721e0daca5c58e952a2 (patch)
tree: a5946d7570b7b3a85824760b302c2863d0de0aa4
parent: Improve logging by making it clearer which script is failing if an assembly f... (diff)
download: opensim-SC_OLD-8a22ac3f94a3b8275d794721e0daca5c58e952a2.zip
opensim-SC_OLD-8a22ac3f94a3b8275d794721e0daca5c58e952a2.tar.gz
opensim-SC_OLD-8a22ac3f94a3b8275d794721e0daca5c58e952a2.tar.bz2
opensim-SC_OLD-8a22ac3f94a3b8275d794721e0daca5c58e952a2.tar.xz
5 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs
index d2323f5..30e99b0 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs
@@ -46,6 +46,6 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
        /// <param name='item'>/param>
        /// <param name='coopSleepHandle'>/param>
        void Initialize(
-            IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, EventWaitHandle coopSleepHandle);
+            IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle);
    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index cee10a8..89ea4e9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -91,7 +91,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// Used for script sleeps when we are using co-operative script termination.
        /// </summary>
        /// <remarks>null if co-operative script termination is not active</remarks>  
-        EventWaitHandle m_coopSleepHandle;       
+        WaitHandle m_coopSleepHandle;       
        /// <summary>
        /// The item that hosts this script
@@ -118,7 +118,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        protected ISoundModule m_SoundModule = null;
        public void Initialize(
-            IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, EventWaitHandle coopSleepHandle)
+            IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle)
        {
            m_ScriptEngine = scriptEngine;
            m_host = host;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
index a08ccc8..1d6cb6d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        internal IScriptModuleComms m_comms = null;
        public void Initialize(
-            IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, EventWaitHandle coopSleepHandle)
+            IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle)
        {
            m_ScriptEngine = scriptEngine;
            m_host = host;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
index 981499e..9045672 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        internal IScriptModuleComms m_comms = null;
        public void Initialize(
-            IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, EventWaitHandle coopSleepHandle)
+            IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle)
        {
            m_ScriptEngine = scriptEngine;
            m_host = host;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 25635ff..f2f8fd6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -143,7 +143,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        protected IUrlModule m_UrlModule = null;
        public void Initialize(
-            IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, EventWaitHandle coopSleepHandle)
+            IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle)
        {
            m_ScriptEngine = scriptEngine;
            m_host = host;
author	Justin Clark-Casey (justincc)	2013-01-23 23:38:08 +0000
committer	Justin Clark-Casey (justincc)	2013-01-23 23:38:08 +0000
commit	8a22ac3f94a3b8275d794721e0daca5c58e952a2 (patch)
tree	a5946d7570b7b3a85824760b302c2863d0de0aa4
parent	Improve logging by making it clearer which script is failing if an assembly f... (diff)
download	opensim-SC_OLD-8a22ac3f94a3b8275d794721e0daca5c58e952a2.zip opensim-SC_OLD-8a22ac3f94a3b8275d794721e0daca5c58e952a2.tar.gz opensim-SC_OLD-8a22ac3f94a3b8275d794721e0daca5c58e952a2.tar.bz2 opensim-SC_OLD-8a22ac3f94a3b8275d794721e0daca5c58e952a2.tar.xz

diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs index d2323f5..30e99b0 100644 --- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs +++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs
@@ -46,6 +46,6 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
46	/// <param name='item'>/param>	46	/// <param name='item'>/param>
47	/// <param name='coopSleepHandle'>/param>	47	/// <param name='coopSleepHandle'>/param>
48	void Initialize(	48	void Initialize(
49	IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, EventWaitHandle coopSleepHandle);	49	IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle);
50	}	50	}
51	} \ No newline at end of file	51	} \ No newline at end of file


diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index cee10a8..89ea4e9 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -91,7 +91,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
91	/// Used for script sleeps when we are using co-operative script termination.	91	/// Used for script sleeps when we are using co-operative script termination.
92	/// </summary>	92	/// </summary>
93	/// <remarks>null if co-operative script termination is not active</remarks>	93	/// <remarks>null if co-operative script termination is not active</remarks>
94	EventWaitHandle m_coopSleepHandle;	94	WaitHandle m_coopSleepHandle;
95		95
96	/// <summary>	96	/// <summary>
97	/// The item that hosts this script	97	/// The item that hosts this script
@@ -118,7 +118,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
118	protected ISoundModule m_SoundModule = null;	118	protected ISoundModule m_SoundModule = null;
119		119
120	public void Initialize(	120	public void Initialize(
121	IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, EventWaitHandle coopSleepHandle)	121	IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle)
122	{	122	{
123	m_ScriptEngine = scriptEngine;	123	m_ScriptEngine = scriptEngine;
124	m_host = host;	124	m_host = host;


diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs index a08ccc8..1d6cb6d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
63	internal IScriptModuleComms m_comms = null;	63	internal IScriptModuleComms m_comms = null;
64		64
65	public void Initialize(	65	public void Initialize(
66	IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, EventWaitHandle coopSleepHandle)	66	IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle)
67	{	67	{
68	m_ScriptEngine = scriptEngine;	68	m_ScriptEngine = scriptEngine;
69	m_host = host;	69	m_host = host;


diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs index 981499e..9045672 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
63	internal IScriptModuleComms m_comms = null;	63	internal IScriptModuleComms m_comms = null;
64		64
65	public void Initialize(	65	public void Initialize(
66	IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, EventWaitHandle coopSleepHandle)	66	IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle)
67	{	67	{
68	m_ScriptEngine = scriptEngine;	68	m_ScriptEngine = scriptEngine;
69	m_host = host;	69	m_host = host;


diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 25635ff..f2f8fd6 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -143,7 +143,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
143	protected IUrlModule m_UrlModule = null;	143	protected IUrlModule m_UrlModule = null;
144		144
145	public void Initialize(	145	public void Initialize(
146	IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, EventWaitHandle coopSleepHandle)	146	IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle)
147	{	147	{
148	m_ScriptEngine = scriptEngine;	148	m_ScriptEngine = scriptEngine;
149	m_host = host;	149	m_host = host;