diff options
author | Adam Frisby | 2008-04-21 07:09:17 +0000 |
---|---|---|
committer | Adam Frisby | 2008-04-21 07:09:17 +0000 |
commit | fef3b3689492dea63693c964bcdbec9f5137eb5e (patch) | |
tree | 7791eef001d85d3e1de863a68f26ff9434d062ca /OpenSim/Region/ScriptEngine/Common/ScriptEngineBase | |
parent | * Terrain Module code has been reformatted to comply with guidelines. (diff) | |
download | opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.zip opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.gz opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.bz2 opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.xz |
* Optimised using statements and namespace references across entire project (this took a while to run).
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common/ScriptEngineBase')
14 files changed, 20 insertions, 75 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs index 41100c9..262d75f 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs | |||
@@ -29,7 +29,6 @@ using System; | |||
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using OpenSim.Region.ScriptEngine.Common; | ||
33 | 32 | ||
34 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | 33 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase |
35 | { | 34 | { |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs index a1bb5c9..7dad7ee 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs | |||
@@ -25,16 +25,11 @@ | |||
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; | ||
29 | using System.Collections; | 28 | using System.Collections; |
30 | using System.Collections.Generic; | ||
31 | using System.Threading; | 29 | using System.Threading; |
32 | using libsecondlife; | 30 | using libsecondlife; |
33 | using Axiom.Math; | ||
34 | using OpenSim.Region.Environment.Interfaces; | ||
35 | using OpenSim.Region.Environment.Modules; | ||
36 | using OpenSim.Region.Environment.Scenes; | ||
37 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | using OpenSim.Region.Environment.Interfaces; | ||
38 | using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins; | 33 | using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins; |
39 | using Timer=OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins.Timer; | 34 | using Timer=OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins.Timer; |
40 | 35 | ||
@@ -50,11 +45,11 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
50 | 45 | ||
51 | public ScriptEngine m_ScriptEngine; | 46 | public ScriptEngine m_ScriptEngine; |
52 | 47 | ||
53 | public AsyncCommandPlugins.Timer m_Timer; | 48 | public Timer m_Timer; |
54 | public AsyncCommandPlugins.HttpRequest m_HttpRequest; | 49 | public HttpRequest m_HttpRequest; |
55 | public AsyncCommandPlugins.Listener m_Listener; | 50 | public Listener m_Listener; |
56 | public AsyncCommandPlugins.SensorRepeat m_SensorRepeat; | 51 | public SensorRepeat m_SensorRepeat; |
57 | public AsyncCommandPlugins.XmlRequest m_XmlRequest; | 52 | public XmlRequest m_XmlRequest; |
58 | 53 | ||
59 | public AsyncCommandManager(ScriptEngine _ScriptEngine) | 54 | public AsyncCommandManager(ScriptEngine _ScriptEngine) |
60 | { | 55 | { |
@@ -81,7 +76,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
81 | cmdHandlerThread.Priority = ThreadPriority.BelowNormal; | 76 | cmdHandlerThread.Priority = ThreadPriority.BelowNormal; |
82 | cmdHandlerThread.IsBackground = true; | 77 | cmdHandlerThread.IsBackground = true; |
83 | cmdHandlerThread.Start(); | 78 | cmdHandlerThread.Start(); |
84 | OpenSim.Framework.ThreadTracker.Add(cmdHandlerThread); | 79 | ThreadTracker.Add(cmdHandlerThread); |
85 | } | 80 | } |
86 | } | 81 | } |
87 | 82 | ||
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/HttpRequest.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/HttpRequest.cs index d62734f..521402e 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/HttpRequest.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/HttpRequest.cs | |||
@@ -26,16 +26,8 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | ||
30 | using System.Collections.Generic; | ||
31 | using System.Threading; | ||
32 | using libsecondlife; | ||
33 | using Axiom.Math; | ||
34 | using OpenSim.Region.Environment.Interfaces; | 29 | using OpenSim.Region.Environment.Interfaces; |
35 | using OpenSim.Region.Environment.Modules; | 30 | using OpenSim.Region.Environment.Modules; |
36 | using OpenSim.Region.Environment.Scenes; | ||
37 | using OpenSim.Framework; | ||
38 | using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins; | ||
39 | 31 | ||
40 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins | 32 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins |
41 | { | 33 | { |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Listener.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Listener.cs index 00cbd8c..874a905 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Listener.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Listener.cs | |||
@@ -25,16 +25,8 @@ | |||
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; | ||
29 | using System.Collections; | ||
30 | using System.Collections.Generic; | ||
31 | using System.Threading; | ||
32 | using libsecondlife; | ||
33 | using Axiom.Math; | ||
34 | using OpenSim.Region.Environment.Interfaces; | 28 | using OpenSim.Region.Environment.Interfaces; |
35 | using OpenSim.Region.Environment.Modules; | 29 | using OpenSim.Region.Environment.Modules; |
36 | using OpenSim.Region.Environment.Scenes; | ||
37 | using OpenSim.Framework; | ||
38 | 30 | ||
39 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins | 31 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins |
40 | { | 32 | { |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs index fd8dbd1..71ae80c 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs | |||
@@ -26,15 +26,10 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | ||
30 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
31 | using System.Threading; | ||
32 | using libsecondlife; | 30 | using libsecondlife; |
33 | using Axiom.Math; | ||
34 | using OpenSim.Region.Environment.Interfaces; | ||
35 | using OpenSim.Region.Environment.Modules; | ||
36 | using OpenSim.Region.Environment.Scenes; | ||
37 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | using OpenSim.Region.Environment.Scenes; | ||
38 | 33 | ||
39 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins | 34 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins |
40 | { | 35 | { |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Timer.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Timer.cs index 63a8d19..141e471 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Timer.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Timer.cs | |||
@@ -28,13 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Threading; | ||
32 | using libsecondlife; | 31 | using libsecondlife; |
33 | using Axiom.Math; | ||
34 | using OpenSim.Region.Environment.Interfaces; | ||
35 | using OpenSim.Region.Environment.Modules; | ||
36 | using OpenSim.Region.Environment.Scenes; | ||
37 | using OpenSim.Framework; | ||
38 | 32 | ||
39 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins | 33 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins |
40 | { | 34 | { |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/XmlRequest.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/XmlRequest.cs index be4f418..c3e1804 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/XmlRequest.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/XmlRequest.cs | |||
@@ -26,15 +26,8 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | ||
30 | using System.Collections.Generic; | ||
31 | using System.Threading; | ||
32 | using libsecondlife; | ||
33 | using Axiom.Math; | ||
34 | using OpenSim.Region.Environment.Interfaces; | 29 | using OpenSim.Region.Environment.Interfaces; |
35 | using OpenSim.Region.Environment.Modules; | 30 | using OpenSim.Region.Environment.Modules; |
36 | using OpenSim.Region.Environment.Scenes; | ||
37 | using OpenSim.Framework; | ||
38 | 31 | ||
39 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins | 32 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins |
40 | { | 33 | { |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs index 2f2b384..b4789a9 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs | |||
@@ -35,7 +35,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
35 | /// Prepares events so they can be directly executed upon a script by EventQueueManager, then queues it. | 35 | /// Prepares events so they can be directly executed upon a script by EventQueueManager, then queues it. |
36 | /// </summary> | 36 | /// </summary> |
37 | [Serializable] | 37 | [Serializable] |
38 | public class EventManager : OpenSim.Region.ScriptEngine.Common.ScriptServerInterfaces.RemoteEvents, iScriptEngineFunctionModule | 38 | public class EventManager : ScriptServerInterfaces.RemoteEvents, iScriptEngineFunctionModule |
39 | { | 39 | { |
40 | // | 40 | // |
41 | // Class is instanced in "ScriptEngine" and Uses "EventQueueManager" that is also instanced in "ScriptEngine". | 41 | // Class is instanced in "ScriptEngine" and Uses "EventQueueManager" that is also instanced in "ScriptEngine". |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs index cd03699..7cbbd4f 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs | |||
@@ -28,10 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Threading; | ||
32 | using libsecondlife; | 31 | using libsecondlife; |
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Region.Environment.Scenes.Scripting; | ||
35 | 32 | ||
36 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | 33 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase |
37 | { | 34 | { |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs index b8d950a..d77f698 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs | |||
@@ -27,11 +27,8 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | ||
31 | using System.Text; | ||
32 | using System.Threading; | 30 | using System.Threading; |
33 | using libsecondlife; | 31 | using libsecondlife; |
34 | using Nini.Config; | ||
35 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
36 | using OpenSim.Region.Environment.Scenes.Scripting; | 33 | using OpenSim.Region.Environment.Scenes.Scripting; |
37 | 34 | ||
@@ -123,7 +120,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
123 | EventQueueThread.Priority = MyThreadPriority; | 120 | EventQueueThread.Priority = MyThreadPriority; |
124 | EventQueueThread.Name = "EventQueueManagerThread_" + ThreadCount; | 121 | EventQueueThread.Name = "EventQueueManagerThread_" + ThreadCount; |
125 | EventQueueThread.Start(); | 122 | EventQueueThread.Start(); |
126 | OpenSim.Framework.ThreadTracker.Add(EventQueueThread); | 123 | ThreadTracker.Add(EventQueueThread); |
127 | 124 | ||
128 | // Look at this... Don't you wish everyone did that solid coding everywhere? :P | 125 | // Look at this... Don't you wish everyone did that solid coding everywhere? :P |
129 | if (ThreadCount == int.MaxValue) | 126 | if (ThreadCount == int.MaxValue) |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs index ad41e5b..2bf0e41 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs | |||
@@ -27,9 +27,8 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | ||
31 | using System.Text; | ||
32 | using System.Threading; | 30 | using System.Threading; |
31 | using OpenSim.Framework; | ||
33 | 32 | ||
34 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | 33 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase |
35 | { | 34 | { |
@@ -94,7 +93,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
94 | MaintenanceThreadThread.Name = "ScriptMaintenanceThread"; | 93 | MaintenanceThreadThread.Name = "ScriptMaintenanceThread"; |
95 | MaintenanceThreadThread.IsBackground = true; | 94 | MaintenanceThreadThread.IsBackground = true; |
96 | MaintenanceThreadThread.Start(); | 95 | MaintenanceThreadThread.Start(); |
97 | OpenSim.Framework.ThreadTracker.Add(MaintenanceThreadThread); | 96 | ThreadTracker.Add(MaintenanceThreadThread); |
98 | } | 97 | } |
99 | } | 98 | } |
100 | 99 | ||
@@ -144,7 +143,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
144 | { | 143 | { |
145 | while (true) | 144 | while (true) |
146 | { | 145 | { |
147 | System.Threading.Thread.Sleep(MaintenanceLoopms); // Sleep before next pass | 146 | Thread.Sleep(MaintenanceLoopms); // Sleep before next pass |
148 | 147 | ||
149 | // Reset counters? | 148 | // Reset counters? |
150 | if (MaintenanceLoopTicks_ScriptLoadUnload_ResetCount) | 149 | if (MaintenanceLoopTicks_ScriptLoadUnload_ResetCount) |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs index 02e49a2..a7ad50d 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs | |||
@@ -27,13 +27,11 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | 30 | using System.Reflection; |
31 | using log4net; | ||
31 | using Nini.Config; | 32 | using Nini.Config; |
32 | using OpenSim.Framework.Console; | ||
33 | using OpenSim.Region.Environment.Interfaces; | 33 | using OpenSim.Region.Environment.Interfaces; |
34 | using OpenSim.Region.Environment.Scenes; | 34 | using OpenSim.Region.Environment.Scenes; |
35 | using OpenSim.Region.ScriptEngine.Common; | ||
36 | using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase; | ||
37 | 35 | ||
38 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | 36 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase |
39 | { | 37 | { |
@@ -42,9 +40,9 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
42 | /// </summary> | 40 | /// </summary> |
43 | /// | 41 | /// |
44 | [Serializable] | 42 | [Serializable] |
45 | public abstract class ScriptEngine : IRegionModule, OpenSim.Region.ScriptEngine.Common.ScriptServerInterfaces.ScriptEngine, iScriptEngineFunctionModule | 43 | public abstract class ScriptEngine : IRegionModule, ScriptServerInterfaces.ScriptEngine, iScriptEngineFunctionModule |
46 | { | 44 | { |
47 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
48 | 46 | ||
49 | public static List<ScriptEngine> ScriptEngines = new List<ScriptEngine>(); | 47 | public static List<ScriptEngine> ScriptEngines = new List<ScriptEngine>(); |
50 | public Scene World; | 48 | public Scene World; |
@@ -75,7 +73,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
75 | 73 | ||
76 | public abstract ScriptManager _GetScriptManager(); | 74 | public abstract ScriptManager _GetScriptManager(); |
77 | 75 | ||
78 | public log4net.ILog Log | 76 | public ILog Log |
79 | { | 77 | { |
80 | get { return m_log; } | 78 | get { return m_log; } |
81 | } | 79 | } |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs index 09f84d6..cd2e530 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs | |||
@@ -32,9 +32,7 @@ using System.Reflection; | |||
32 | using System.Runtime.Serialization.Formatters.Binary; | 32 | using System.Runtime.Serialization.Formatters.Binary; |
33 | using System.Threading; | 33 | using System.Threading; |
34 | using libsecondlife; | 34 | using libsecondlife; |
35 | using OpenSim.Framework; | ||
36 | using OpenSim.Region.Environment.Scenes; | 35 | using OpenSim.Region.Environment.Scenes; |
37 | using OpenSim.Region.ScriptEngine.Common; | ||
38 | 36 | ||
39 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | 37 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase |
40 | { | 38 | { |
@@ -106,9 +104,9 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
106 | 104 | ||
107 | #region Object init/shutdown | 105 | #region Object init/shutdown |
108 | 106 | ||
109 | public ScriptEngineBase.ScriptEngine m_scriptEngine; | 107 | public ScriptEngine m_scriptEngine; |
110 | 108 | ||
111 | public ScriptManager(ScriptEngineBase.ScriptEngine scriptEngine) | 109 | public ScriptManager(ScriptEngine scriptEngine) |
112 | { | 110 | { |
113 | m_scriptEngine = scriptEngine; | 111 | m_scriptEngine = scriptEngine; |
114 | } | 112 | } |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/iScriptEngineFunctionModule.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/iScriptEngineFunctionModule.cs index 4e037b3..768ba6d 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/iScriptEngineFunctionModule.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/iScriptEngineFunctionModule.cs | |||
@@ -25,10 +25,6 @@ | |||
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; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | 28 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase |
33 | { | 29 | { |
34 | public interface iScriptEngineFunctionModule | 30 | public interface iScriptEngineFunctionModule |