diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 75aea2b..e6ec0e1 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
@@ -267,13 +267,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
267 | try | 267 | try |
268 | { | 268 | { |
269 | if (dom != System.AppDomain.CurrentDomain) | 269 | if (dom != System.AppDomain.CurrentDomain) |
270 | m_Script = (IScript)dom.CreateInstanceAndUnwrap( | 270 | m_Script |
271 | = (IScript)dom.CreateInstanceAndUnwrap( | ||
271 | Path.GetFileNameWithoutExtension(assembly), | 272 | Path.GetFileNameWithoutExtension(assembly), |
272 | "SecondLife.Script"); | 273 | "SecondLife.Script", |
274 | false, | ||
275 | BindingFlags.Default, | ||
276 | null, | ||
277 | new object[] { m_coopSleepHandle }, | ||
278 | null, | ||
279 | null, | ||
280 | null); | ||
273 | else | 281 | else |
274 | m_Script = (IScript)Assembly.Load( | 282 | m_Script |
275 | Path.GetFileNameWithoutExtension(assembly)).CreateInstance( | 283 | = (IScript)Assembly.Load(Path.GetFileNameWithoutExtension(assembly)).CreateInstance( |
276 | "SecondLife.Script"); | 284 | "SecondLife.Script", |
285 | false, | ||
286 | BindingFlags.Default, | ||
287 | null, | ||
288 | new object[] { m_coopSleepHandle }, | ||
289 | null, | ||
290 | null); | ||
277 | 291 | ||
278 | //ILease lease = (ILease)RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass); | 292 | //ILease lease = (ILease)RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass); |
279 | //RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass); | 293 | //RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass); |