3 files changed, 140 insertions, 140 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs b/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs
index bb05db9..fdca945 100644
--- a/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs
@@ -1,108 +1,108 @@
-/*
+/*
-* Copyright (c) Contributors, http://opensimulator.org/
+* Copyright (c) Contributors, http://opensimulator.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
+*
-* Redistribution and use in source and binary forms, with or without
+* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
+* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
+*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
+*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
+*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
+*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
+*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
+*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
+*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
+*       derived from this software without specific prior written permission.
-*
+*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
+* 
-*/
+*/
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Runtime.Remoting.Lifetime;
+using System.Runtime.Remoting.Lifetime;
-using System.Text;
+using System.Text;
-namespace OpenSim.Region.ScriptEngine.Common
+namespace OpenSim.Region.ScriptEngine.Common
-{
+{
-    public abstract class ExecutorBase : MarshalByRefObject
+    public abstract class ExecutorBase : MarshalByRefObject
-    {
+    {
-        /// <summary>
+        /// <summary>
-        /// Contains the script to execute functions in.
+        /// Contains the script to execute functions in.
-        /// </summary>
+        /// </summary>
-        protected IScript m_Script;
+        protected IScript m_Script;
-        /// <summary>
+        /// <summary>
-        /// If set to False events will not be executed.
+        /// If set to False events will not be executed.
-        /// </summary>
+        /// </summary>
-        protected bool m_Running = true;
+        protected bool m_Running = true;
-        /// <summary>
+        /// <summary>
-        /// Create a new instance of ExecutorBase
+        /// Create a new instance of ExecutorBase
-        /// </summary>
+        /// </summary>
-        /// <param name="Script"></param>
+        /// <param name="Script"></param>
-        public ExecutorBase(IScript Script)
+        public ExecutorBase(IScript Script)
-        {
+        {
-            m_Script = Script;
+            m_Script = Script;
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Make sure our object does not timeout when in AppDomain. (Called by ILease base class)
+        /// Make sure our object does not timeout when in AppDomain. (Called by ILease base class)
-        /// </summary>
+        /// </summary>
-        /// <returns></returns>
+        /// <returns></returns>
-        public override Object InitializeLifetimeService()
+        public override Object InitializeLifetimeService()
-        {
+        {
-            //Console.WriteLine("Executor: InitializeLifetimeService()");
+            //Console.WriteLine("Executor: InitializeLifetimeService()");
-            //            return null;
+            //            return null;
-            ILease lease = (ILease)base.InitializeLifetimeService();
+            ILease lease = (ILease)base.InitializeLifetimeService();
-            if (lease.CurrentState == LeaseState.Initial)
+            if (lease.CurrentState == LeaseState.Initial)
-            {
+            {
-                lease.InitialLeaseTime = TimeSpan.Zero; // TimeSpan.FromMinutes(1);
+                lease.InitialLeaseTime = TimeSpan.Zero; // TimeSpan.FromMinutes(1);
-                //                lease.SponsorshipTimeout = TimeSpan.FromMinutes(2);
+                //                lease.SponsorshipTimeout = TimeSpan.FromMinutes(2);
-                //                lease.RenewOnCallTime = TimeSpan.FromSeconds(2);
+                //                lease.RenewOnCallTime = TimeSpan.FromSeconds(2);
-            }
+            }
-            return lease;
+            return lease;
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Get current AppDomain
+        /// Get current AppDomain
-        /// </summary>
+        /// </summary>
-        /// <returns>Current AppDomain</returns>
+        /// <returns>Current AppDomain</returns>
-        public AppDomain GetAppDomain()
+        public AppDomain GetAppDomain()
-        {
+        {
-            return AppDomain.CurrentDomain;
+            return AppDomain.CurrentDomain;
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Execute a specific function/event in script.
+        /// Execute a specific function/event in script.
-        /// </summary>
+        /// </summary>
-        /// <param name="FunctionName">Name of function to execute</param>
+        /// <param name="FunctionName">Name of function to execute</param>
-        /// <param name="args">Arguments to pass to function</param>
+        /// <param name="args">Arguments to pass to function</param>
-        public void ExecuteEvent(string FunctionName, object[] args)
+        public void ExecuteEvent(string FunctionName, object[] args)
-        {
+        {
-            if (m_Running == false)
+            if (m_Running == false)
-            {
+            {
-                // Script is inactive, do not execute!
+                // Script is inactive, do not execute!
-                return;
+                return;
-            }
+            }
-            DoExecuteEvent(FunctionName, args);
+            DoExecuteEvent(FunctionName, args);
-        }
+        }
-        protected abstract void DoExecuteEvent(string FunctionName, object[] args);
+        protected abstract void DoExecuteEvent(string FunctionName, object[] args);
-        /// <summary>
+        /// <summary>
-        /// Stop script from running. Event execution will be ignored.
+        /// Stop script from running. Event execution will be ignored.
-        /// </summary>
+        /// </summary>
-        public void StopScript()
+        public void StopScript()
-        {
+        {
-            m_Running = false;
+            m_Running = false;
-        }
+        }
-    }
+    }
-}
+}
diff --git a/OpenSim/Region/ScriptEngine/Common/TRPC/MyBase.cs b/OpenSim/Region/ScriptEngine/Common/TRPC/MyBase.cs
index 1f66b14..46c5db4 100644
--- a/OpenSim/Region/ScriptEngine/Common/TRPC/MyBase.cs
+++ b/OpenSim/Region/ScriptEngine/Common/TRPC/MyBase.cs
@@ -1,10 +1,10 @@
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Text;
+using System.Text;
-namespace OpenSim.Region.ScriptEngine.Common.TRPC
+namespace OpenSim.Region.ScriptEngine.Common.TRPC
-{
+{
-    class MyBase
+    class MyBase
-    {
+    {
-    }
+    }
-}
+}
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSOScript.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSOScript.cs
index e87bec8..27a1551 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/LSOScript.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSOScript.cs
@@ -1,22 +1,22 @@
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.IO;
+using System.IO;
-using System.Text;
+using System.Text;
-using OpenSim.Region.ScriptEngine.LSOEngine.LSO;
+using OpenSim.Region.ScriptEngine.LSOEngine.LSO;
-namespace OpenSim.Region.ScriptEngine.LSOEngine
+namespace OpenSim.Region.ScriptEngine.LSOEngine
-{
+{
-    /// <summary>
+    /// <summary>
-    /// This class encapsulated an LSO file and contains execution-specific data
+    /// This class encapsulated an LSO file and contains execution-specific data
-    /// </summary>
+    /// </summary>
-    public class LSOScript
+    public class LSOScript
-    {
+    {
-        private byte[] LSOCode = new byte[1024 * 16];              // Contains the LSO-file
+        private byte[] LSOCode = new byte[1024 * 16];              // Contains the LSO-file
-        //private System.IO.MemoryStream LSOCode = new MemoryStream(1024 * 16);
+        //private System.IO.MemoryStream LSOCode = new MemoryStream(1024 * 16);
-        public void Execute(LSO_Enums.Event_Mask_Values Event, params object[] param)
+        public void Execute(LSO_Enums.Event_Mask_Values Event, params object[] param)
-        {
+        {
-            
+            
-        }
+        }
-    }
+    }
-}
+}

diff --git a/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs b/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs index bb05db9..fdca945 100644 --- a/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs +++ b/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs
@@ -1,108 +1,108 @@
1	/*	1	/*
2	* Copyright (c) Contributors, http://opensimulator.org/	2	* Copyright (c) Contributors, http://opensimulator.org/
3	* See CONTRIBUTORS.TXT for a full list of copyright holders.	3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
4	*	4	*
5	* Redistribution and use in source and binary forms, with or without	5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions are met:	6	* modification, are permitted provided that the following conditions are met:
7	* * Redistributions of source code must retain the above copyright	7	* * Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.	8	* notice, this list of conditions and the following disclaimer.
9	* * Redistributions in binary form must reproduce the above copyright	9	* * Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the	10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.	11	* documentation and/or other materials provided with the distribution.
12	* * Neither the name of the OpenSim Project nor the	12	* * Neither the name of the OpenSim Project nor the
13	* names of its contributors may be used to endorse or promote products	13	* names of its contributors may be used to endorse or promote products
14	* derived from this software without specific prior written permission.	14	* derived from this software without specific prior written permission.
15	*	15	*
16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY	16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY
17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED	17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE	18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY	19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES	20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;	21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND	22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS	24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26	*	26	*
27	*/	27	*/
28	using System;	28	using System;
29	using System.Collections.Generic;	29	using System.Collections.Generic;
30	using System.Runtime.Remoting.Lifetime;	30	using System.Runtime.Remoting.Lifetime;
31	using System.Text;	31	using System.Text;
32		32
33	namespace OpenSim.Region.ScriptEngine.Common	33	namespace OpenSim.Region.ScriptEngine.Common
34	{	34	{
35	public abstract class ExecutorBase : MarshalByRefObject	35	public abstract class ExecutorBase : MarshalByRefObject
36	{	36	{
37	/// <summary>	37	/// <summary>
38	/// Contains the script to execute functions in.	38	/// Contains the script to execute functions in.
39	/// </summary>	39	/// </summary>
40	protected IScript m_Script;	40	protected IScript m_Script;
41	/// <summary>	41	/// <summary>
42	/// If set to False events will not be executed.	42	/// If set to False events will not be executed.
43	/// </summary>	43	/// </summary>
44	protected bool m_Running = true;	44	protected bool m_Running = true;
45		45
46	/// <summary>	46	/// <summary>
47	/// Create a new instance of ExecutorBase	47	/// Create a new instance of ExecutorBase
48	/// </summary>	48	/// </summary>
49	/// <param name="Script"></param>	49	/// <param name="Script"></param>
50	public ExecutorBase(IScript Script)	50	public ExecutorBase(IScript Script)
51	{	51	{
52	m_Script = Script;	52	m_Script = Script;
53	}	53	}
54		54
55	/// <summary>	55	/// <summary>
56	/// Make sure our object does not timeout when in AppDomain. (Called by ILease base class)	56	/// Make sure our object does not timeout when in AppDomain. (Called by ILease base class)
57	/// </summary>	57	/// </summary>
58	/// <returns></returns>	58	/// <returns></returns>
59	public override Object InitializeLifetimeService()	59	public override Object InitializeLifetimeService()
60	{	60	{
61	//Console.WriteLine("Executor: InitializeLifetimeService()");	61	//Console.WriteLine("Executor: InitializeLifetimeService()");
62	// return null;	62	// return null;
63	ILease lease = (ILease)base.InitializeLifetimeService();	63	ILease lease = (ILease)base.InitializeLifetimeService();
64		64
65	if (lease.CurrentState == LeaseState.Initial)	65	if (lease.CurrentState == LeaseState.Initial)
66	{	66	{
67	lease.InitialLeaseTime = TimeSpan.Zero; // TimeSpan.FromMinutes(1);	67	lease.InitialLeaseTime = TimeSpan.Zero; // TimeSpan.FromMinutes(1);
68	// lease.SponsorshipTimeout = TimeSpan.FromMinutes(2);	68	// lease.SponsorshipTimeout = TimeSpan.FromMinutes(2);
69	// lease.RenewOnCallTime = TimeSpan.FromSeconds(2);	69	// lease.RenewOnCallTime = TimeSpan.FromSeconds(2);
70	}	70	}
71	return lease;	71	return lease;
72	}	72	}
73		73
74	/// <summary>	74	/// <summary>
75	/// Get current AppDomain	75	/// Get current AppDomain
76	/// </summary>	76	/// </summary>
77	/// <returns>Current AppDomain</returns>	77	/// <returns>Current AppDomain</returns>
78	public AppDomain GetAppDomain()	78	public AppDomain GetAppDomain()
79	{	79	{
80	return AppDomain.CurrentDomain;	80	return AppDomain.CurrentDomain;
81	}	81	}
82		82
83	/// <summary>	83	/// <summary>
84	/// Execute a specific function/event in script.	84	/// Execute a specific function/event in script.
85	/// </summary>	85	/// </summary>
86	/// <param name="FunctionName">Name of function to execute</param>	86	/// <param name="FunctionName">Name of function to execute</param>
87	/// <param name="args">Arguments to pass to function</param>	87	/// <param name="args">Arguments to pass to function</param>
88	public void ExecuteEvent(string FunctionName, object[] args)	88	public void ExecuteEvent(string FunctionName, object[] args)
89	{	89	{
90	if (m_Running == false)	90	if (m_Running == false)
91	{	91	{
92	// Script is inactive, do not execute!	92	// Script is inactive, do not execute!
93	return;	93	return;
94	}	94	}
95	DoExecuteEvent(FunctionName, args);	95	DoExecuteEvent(FunctionName, args);
96	}	96	}
97	protected abstract void DoExecuteEvent(string FunctionName, object[] args);	97	protected abstract void DoExecuteEvent(string FunctionName, object[] args);
98		98
99	/// <summary>	99	/// <summary>
100	/// Stop script from running. Event execution will be ignored.	100	/// Stop script from running. Event execution will be ignored.
101	/// </summary>	101	/// </summary>
102	public void StopScript()	102	public void StopScript()
103	{	103	{
104	m_Running = false;	104	m_Running = false;
105	}	105	}
106		106
107	}	107	}
108	}	108	}


diff --git a/OpenSim/Region/ScriptEngine/Common/TRPC/MyBase.cs b/OpenSim/Region/ScriptEngine/Common/TRPC/MyBase.cs index 1f66b14..46c5db4 100644 --- a/OpenSim/Region/ScriptEngine/Common/TRPC/MyBase.cs +++ b/OpenSim/Region/ScriptEngine/Common/TRPC/MyBase.cs
@@ -1,10 +1,10 @@
1	using System;	1	using System;
2	using System.Collections.Generic;	2	using System.Collections.Generic;
3	using System.Text;	3	using System.Text;
4		4
5	namespace OpenSim.Region.ScriptEngine.Common.TRPC	5	namespace OpenSim.Region.ScriptEngine.Common.TRPC
6	{	6	{
7	class MyBase	7	class MyBase
8	{	8	{
9	}	9	}
10	}	10	}


diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSOScript.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSOScript.cs index e87bec8..27a1551 100644 --- a/OpenSim/Region/ScriptEngine/LSOEngine/LSOScript.cs +++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSOScript.cs
@@ -1,22 +1,22 @@
1	using System;	1	using System;
2	using System.Collections.Generic;	2	using System.Collections.Generic;
3	using System.IO;	3	using System.IO;
4	using System.Text;	4	using System.Text;
5	using OpenSim.Region.ScriptEngine.LSOEngine.LSO;	5	using OpenSim.Region.ScriptEngine.LSOEngine.LSO;
6		6
7	namespace OpenSim.Region.ScriptEngine.LSOEngine	7	namespace OpenSim.Region.ScriptEngine.LSOEngine
8	{	8	{
9	/// <summary>	9	/// <summary>
10	/// This class encapsulated an LSO file and contains execution-specific data	10	/// This class encapsulated an LSO file and contains execution-specific data
11	/// </summary>	11	/// </summary>
12	public class LSOScript	12	public class LSOScript
13	{	13	{
14	private byte[] LSOCode = new byte[1024 * 16]; // Contains the LSO-file	14	private byte[] LSOCode = new byte[1024 * 16]; // Contains the LSO-file
15	//private System.IO.MemoryStream LSOCode = new MemoryStream(1024 * 16);	15	//private System.IO.MemoryStream LSOCode = new MemoryStream(1024 * 16);
16		16
17	public void Execute(LSO_Enums.Event_Mask_Values Event, params object[] param)	17	public void Execute(LSO_Enums.Event_Mask_Values Event, params object[] param)
18	{	18	{
19		19
20	}	20	}
21	}	21	}
22	}	22	}