From 1952a67ceb3f239d4f55656f1ca55de590556265 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sat, 29 Nov 2008 07:10:00 +0000
Subject: Comment the ScriptSponsor and restore the indefinite lifetime for
 scripts until that can be better debugged

---
 OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs     | 10 +++++-----
 OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs  |  8 ++++----
 OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine')

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
         public Dictionary<string, IScriptApi> Apis;
         public Dictionary<KeyValuePair<int,int>, KeyValuePair<int,int>>
                 LineMap;
-        public ISponsor ScriptSponsor;
+//        public ISponsor ScriptSponsor;
     }
 
     public class ScriptManager
@@ -169,10 +169,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
                         m_scriptEngine.m_AppDomainManager.LoadScript(
                         CompiledScriptFile, out id.AppDomain);
                 //Register the sponsor
-                ISponsor scriptSponsor = new ScriptSponsor();
-                ILease lease = (ILease)RemotingServices.GetLifetimeService(CompiledScript as MarshalByRefObject);
-                lease.Register(scriptSponsor);
-                id.ScriptSponsor = scriptSponsor;
+//                ISponsor scriptSponsor = new ScriptSponsor();
+//                ILease lease = (ILease)RemotingServices.GetLifetimeService(CompiledScript as MarshalByRefObject);
+//                lease.Register(scriptSponsor);
+//                id.ScriptSponsor = scriptSponsor;
 
                 id.LineMap = LSLCompiler.LineMap();
                 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
             ILease lease = (ILease)base.InitializeLifetimeService();
             if (lease.CurrentState == LeaseState.Initial)
             {
-                //lease.InitialLeaseTime = TimeSpan.Zero;
-                lease.InitialLeaseTime = TimeSpan.FromMinutes(1);
-                lease.SponsorshipTimeout = TimeSpan.FromMinutes(2);
-                lease.RenewOnCallTime = TimeSpan.FromSeconds(2);
+                lease.InitialLeaseTime = TimeSpan.Zero;
+//                lease.InitialLeaseTime = TimeSpan.FromMinutes(1);
+//                lease.SponsorshipTimeout = TimeSpan.FromMinutes(2);
+//                lease.RenewOnCallTime = TimeSpan.FromSeconds(2);
             }
             return lease;
         }
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
                     "SecondLife.Script");
 
                 // Add a sponsor to the script
-                ISponsor scriptSponsor = new ScriptSponsor();
-                ILease lease = (ILease)RemotingServices.GetLifetimeService(m_Script as MarshalByRefObject);
-                lease.Register(scriptSponsor);
+//                ISponsor scriptSponsor = new ScriptSponsor();
+//                ILease lease = (ILease)RemotingServices.GetLifetimeService(m_Script as MarshalByRefObject);
+//                lease.Register(scriptSponsor);
                 //m_ScriptSponsor = scriptSponsor;
 
             }
-- 
cgit v1.1