diff options
Diffstat (limited to 'OpenSim/ScriptEngine/Engines')
-rw-r--r-- | OpenSim/ScriptEngine/Engines/DotNetEngine/DotNetEngine.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/ScriptEngine/Engines/DotNetEngine/DotNetEngine.cs b/OpenSim/ScriptEngine/Engines/DotNetEngine/DotNetEngine.cs index 0f9b964..3666ca4 100644 --- a/OpenSim/ScriptEngine/Engines/DotNetEngine/DotNetEngine.cs +++ b/OpenSim/ScriptEngine/Engines/DotNetEngine/DotNetEngine.cs | |||
@@ -38,7 +38,7 @@ using OpenSim.Region.Environment.Scenes; | |||
38 | using OpenSim.ScriptEngine.Components.DotNetEngine.Events; | 38 | using OpenSim.ScriptEngine.Components.DotNetEngine.Events; |
39 | using OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler; | 39 | using OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler; |
40 | using OpenSim.ScriptEngine.Shared; | 40 | using OpenSim.ScriptEngine.Shared; |
41 | using ComponentProviders = OpenSim.ApplicationPlugins.ScriptEngine; | 41 | using ComponentFactory = OpenSim.ApplicationPlugins.ScriptEngine.ComponentFactory; |
42 | 42 | ||
43 | namespace OpenSim.ScriptEngine.Engines.DotNetEngine | 43 | namespace OpenSim.ScriptEngine.Engines.DotNetEngine |
44 | { | 44 | { |
@@ -128,12 +128,12 @@ namespace OpenSim.ScriptEngine.Engines.DotNetEngine | |||
128 | cname = "ScriptManager"; | 128 | cname = "ScriptManager"; |
129 | m_log.DebugFormat("[{0}] Executor: {1}", Name, cname); | 129 | m_log.DebugFormat("[{0}] Executor: {1}", Name, cname); |
130 | RegionInfo.Executors.Add(cname, | 130 | RegionInfo.Executors.Add(cname, |
131 | ScriptEnginePlugin.GetComponentInstance(RegionInfo, cname) as IScriptExecutor); | 131 | ComponentFactory.GetComponentInstance(RegionInfo, cname) as IScriptExecutor); |
132 | 132 | ||
133 | cname = "ScriptLoader"; | 133 | cname = "ScriptLoader"; |
134 | m_log.DebugFormat("[{0}] ScriptLoader: {1}", Name, cname); | 134 | m_log.DebugFormat("[{0}] ScriptLoader: {1}", Name, cname); |
135 | RegionInfo.ScriptLoader = | 135 | RegionInfo.ScriptLoader = |
136 | ScriptEnginePlugin.GetComponentInstance(RegionInfo, cname) as IScriptExecutor as ScriptLoader; | 136 | ComponentFactory.GetComponentInstance(RegionInfo, cname) as IScriptExecutor as ScriptLoader; |
137 | 137 | ||
138 | // CommandProviders | 138 | // CommandProviders |
139 | foreach (string cn in commandNames) | 139 | foreach (string cn in commandNames) |
@@ -141,7 +141,7 @@ namespace OpenSim.ScriptEngine.Engines.DotNetEngine | |||
141 | cname = cn; | 141 | cname = cn; |
142 | m_log.DebugFormat("[{0}] CommandProvider: {1}", Name, cname); | 142 | m_log.DebugFormat("[{0}] CommandProvider: {1}", Name, cname); |
143 | RegionInfo.CommandProviders.Add(cname, | 143 | RegionInfo.CommandProviders.Add(cname, |
144 | ScriptEnginePlugin.GetComponentInstance(RegionInfo, cname) as | 144 | ComponentFactory.GetComponentInstance(RegionInfo, cname) as |
145 | IScriptCommandProvider); | 145 | IScriptCommandProvider); |
146 | } | 146 | } |
147 | 147 | ||
@@ -151,7 +151,7 @@ namespace OpenSim.ScriptEngine.Engines.DotNetEngine | |||
151 | cname = cn; | 151 | cname = cn; |
152 | m_log.DebugFormat("[{0}] Compiler: {1}", Name, cname); | 152 | m_log.DebugFormat("[{0}] Compiler: {1}", Name, cname); |
153 | RegionInfo.Compilers.Add(cname, | 153 | RegionInfo.Compilers.Add(cname, |
154 | ScriptEnginePlugin.GetComponentInstance(RegionInfo, cname) as | 154 | ComponentFactory.GetComponentInstance(RegionInfo, cname) as |
155 | IScriptCompiler); | 155 | IScriptCompiler); |
156 | } | 156 | } |
157 | 157 | ||
@@ -161,14 +161,14 @@ namespace OpenSim.ScriptEngine.Engines.DotNetEngine | |||
161 | cname = cn; | 161 | cname = cn; |
162 | m_log.DebugFormat("[{0}] Scheduler: {1}", Name, cname); | 162 | m_log.DebugFormat("[{0}] Scheduler: {1}", Name, cname); |
163 | RegionInfo.Schedulers.Add(cname, | 163 | RegionInfo.Schedulers.Add(cname, |
164 | ScriptEnginePlugin.GetComponentInstance(RegionInfo, cname) as | 164 | ComponentFactory.GetComponentInstance(RegionInfo, cname) as |
165 | IScriptScheduler); | 165 | IScriptScheduler); |
166 | } | 166 | } |
167 | 167 | ||
168 | // Event provider | 168 | // Event provider |
169 | cname = "LSLEventProvider"; | 169 | cname = "LSLEventProvider"; |
170 | m_log.DebugFormat("[{0}] EventProvider: {1}", Name, cname); | 170 | m_log.DebugFormat("[{0}] EventProvider: {1}", Name, cname); |
171 | IScriptEventProvider sep = ScriptEnginePlugin.GetComponentInstance(RegionInfo, cname) as IScriptEventProvider; | 171 | IScriptEventProvider sep = ComponentFactory.GetComponentInstance(RegionInfo, cname) as IScriptEventProvider; |
172 | RegionInfo.EventProviders.Add(cname, sep); | 172 | RegionInfo.EventProviders.Add(cname, sep); |
173 | m_LSLEventProvider = sep as LSLEventProvider; | 173 | m_LSLEventProvider = sep as LSLEventProvider; |
174 | 174 | ||