OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Comment the ScriptSponsor and restore the indefinite lifetime for 

scripts until that can be better debugged
0.6.1-post-fixes
Melanie Thielker 2008-11-29 07:10:00 +00:00
parent e1153394c1
commit 1952a67ceb
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
View File

@ -59,7 +59,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
public Dictionary<string, IScriptApi> Apis; public Dictionary<string, IScriptApi> Apis;
public Dictionary<KeyValuePair<int,int>, KeyValuePair<int,int>> public Dictionary<KeyValuePair<int,int>, KeyValuePair<int,int>>
LineMap; LineMap;
public ISponsor ScriptSponsor; // public ISponsor ScriptSponsor;
} }
public class ScriptManager public class ScriptManager
@ -169,10 +169,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
m_scriptEngine.m_AppDomainManager.LoadScript( m_scriptEngine.m_AppDomainManager.LoadScript(
CompiledScriptFile, out id.AppDomain); CompiledScriptFile, out id.AppDomain);
//Register the sponsor //Register the sponsor
ISponsor scriptSponsor = new ScriptSponsor(); // ISponsor scriptSponsor = new ScriptSponsor();
ILease lease = (ILease)RemotingServices.GetLifetimeService(CompiledScript as MarshalByRefObject); // ILease lease = (ILease)RemotingServices.GetLifetimeService(CompiledScript as MarshalByRefObject);
lease.Register(scriptSponsor); // lease.Register(scriptSponsor);
id.ScriptSponsor = scriptSponsor; // id.ScriptSponsor = scriptSponsor;
id.LineMap = LSLCompiler.LineMap(); id.LineMap = LSLCompiler.LineMap();
id.Script = CompiledScript; id.Script = CompiledScript;

8
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
View File

@ -50,10 +50,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
ILease lease = (ILease)base.InitializeLifetimeService(); ILease lease = (ILease)base.InitializeLifetimeService();
if (lease.CurrentState == LeaseState.Initial) if (lease.CurrentState == LeaseState.Initial)
{ {
//lease.InitialLeaseTime = TimeSpan.Zero; lease.InitialLeaseTime = TimeSpan.Zero;
lease.InitialLeaseTime = TimeSpan.FromMinutes(1); // lease.InitialLeaseTime = 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;
} }

6
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
View File

@ -210,9 +210,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
"SecondLife.Script"); "SecondLife.Script");
// Add a sponsor to the script // Add a sponsor to the script
ISponsor scriptSponsor = new ScriptSponsor(); // ISponsor scriptSponsor = new ScriptSponsor();
ILease lease = (ILease)RemotingServices.GetLifetimeService(m_Script as MarshalByRefObject); // ILease lease = (ILease)RemotingServices.GetLifetimeService(m_Script as MarshalByRefObject);
lease.Register(scriptSponsor); // lease.Register(scriptSponsor);
//m_ScriptSponsor = scriptSponsor; //m_ScriptSponsor = scriptSponsor;
} }