aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-29 07:10:00 +0000
committerMelanie Thielker2008-11-29 07:10:00 +0000
commit1952a67ceb3f239d4f55656f1ca55de590556265 (patch)
tree8828b0688e1690d0534c356ff5590fbf4ecfffb4
parentStop attachments from twisting away. Thismakes attachments phantom, which (diff)
downloadopensim-SC_OLD-1952a67ceb3f239d4f55656f1ca55de590556265.zip
opensim-SC_OLD-1952a67ceb3f239d4f55656f1ca55de590556265.tar.gz
opensim-SC_OLD-1952a67ceb3f239d4f55656f1ca55de590556265.tar.bz2
opensim-SC_OLD-1952a67ceb3f239d4f55656f1ca55de590556265.tar.xz
Comment the ScriptSponsor and restore the indefinite lifetime for
scripts until that can be better debugged
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs10
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs6
3 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index b5cbd25..f9f6401 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
59 public Dictionary<string, IScriptApi> Apis; 59 public Dictionary<string, IScriptApi> Apis;
60 public Dictionary<KeyValuePair<int,int>, KeyValuePair<int,int>> 60 public Dictionary<KeyValuePair<int,int>, KeyValuePair<int,int>>
61 LineMap; 61 LineMap;
62 public ISponsor ScriptSponsor; 62// public ISponsor ScriptSponsor;
63 } 63 }
64 64
65 public class ScriptManager 65 public class ScriptManager
@@ -169,10 +169,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
169 m_scriptEngine.m_AppDomainManager.LoadScript( 169 m_scriptEngine.m_AppDomainManager.LoadScript(
170 CompiledScriptFile, out id.AppDomain); 170 CompiledScriptFile, out id.AppDomain);
171 //Register the sponsor 171 //Register the sponsor
172 ISponsor scriptSponsor = new ScriptSponsor(); 172// ISponsor scriptSponsor = new ScriptSponsor();
173 ILease lease = (ILease)RemotingServices.GetLifetimeService(CompiledScript as MarshalByRefObject); 173// ILease lease = (ILease)RemotingServices.GetLifetimeService(CompiledScript as MarshalByRefObject);
174 lease.Register(scriptSponsor); 174// lease.Register(scriptSponsor);
175 id.ScriptSponsor = scriptSponsor; 175// id.ScriptSponsor = scriptSponsor;
176 176
177 id.LineMap = LSLCompiler.LineMap(); 177 id.LineMap = LSLCompiler.LineMap();
178 id.Script = CompiledScript; 178 id.Script = CompiledScript;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
index 15604dc..036130d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
@@ -50,10 +50,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
50 ILease lease = (ILease)base.InitializeLifetimeService(); 50 ILease lease = (ILease)base.InitializeLifetimeService();
51 if (lease.CurrentState == LeaseState.Initial) 51 if (lease.CurrentState == LeaseState.Initial)
52 { 52 {
53 //lease.InitialLeaseTime = TimeSpan.Zero; 53 lease.InitialLeaseTime = TimeSpan.Zero;
54 lease.InitialLeaseTime = TimeSpan.FromMinutes(1); 54// lease.InitialLeaseTime = TimeSpan.FromMinutes(1);
55 lease.SponsorshipTimeout = TimeSpan.FromMinutes(2); 55// lease.SponsorshipTimeout = TimeSpan.FromMinutes(2);
56 lease.RenewOnCallTime = TimeSpan.FromSeconds(2); 56// lease.RenewOnCallTime = TimeSpan.FromSeconds(2);
57 } 57 }
58 return lease; 58 return lease;
59 } 59 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index e664fb0..dccd143 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -210,9 +210,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
210 "SecondLife.Script"); 210 "SecondLife.Script");
211 211
212 // Add a sponsor to the script 212 // Add a sponsor to the script
213 ISponsor scriptSponsor = new ScriptSponsor(); 213// ISponsor scriptSponsor = new ScriptSponsor();
214 ILease lease = (ILease)RemotingServices.GetLifetimeService(m_Script as MarshalByRefObject); 214// ILease lease = (ILease)RemotingServices.GetLifetimeService(m_Script as MarshalByRefObject);
215 lease.Register(scriptSponsor); 215// lease.Register(scriptSponsor);
216 //m_ScriptSponsor = scriptSponsor; 216 //m_ScriptSponsor = scriptSponsor;
217 217
218 } 218 }