9 files changed, 55 insertions, 59 deletions

diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScript.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScript.cs
index 726dabc..b9618d1 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScript.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScript.cs
@@ -41,7 +41,5 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         Dictionary<string,Object> GetVars();
         void SetVars(Dictionary<string,Object> vars);
         void ResetVars();
-
-        void Close();
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 5f9b09b..bc36fda 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -119,15 +119,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             AsyncCommands = new AsyncCommandManager(ScriptEngine);
         }
 
+        // Object never expires
         public override Object InitializeLifetimeService()
         {
             ILease lease = (ILease)base.InitializeLifetimeService();
 
             if (lease.CurrentState == LeaseState.Initial)
             {
-                lease.InitialLeaseTime = TimeSpan.FromMinutes(1.0);
-                lease.RenewOnCallTime = TimeSpan.FromSeconds(10.0);
-                lease.SponsorshipTimeout = TimeSpan.FromMinutes(1.0);
+                lease.InitialLeaseTime = TimeSpan.Zero;
             }
             return lease;
         }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index b447cfb..7c878b8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -159,15 +159,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
         }
 
+        //
+        // Never expire this object
+        //
         public override Object InitializeLifetimeService()
         {
             ILease lease = (ILease)base.InitializeLifetimeService();
 
             if (lease.CurrentState == LeaseState.Initial)
             {
-                lease.InitialLeaseTime = TimeSpan.FromMinutes(1.0);
-                lease.RenewOnCallTime = TimeSpan.FromSeconds(10.0);
-                lease.SponsorshipTimeout = TimeSpan.FromMinutes(1.0);
+                lease.InitialLeaseTime = TimeSpan.Zero;
             }
             return lease;
         }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
index 7f67599..2501752 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
@@ -35,7 +35,7 @@ using log4net;
 
 namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
 {
-    public class Executor
+    public class Executor : MarshalByRefObject
     {
         // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -89,6 +89,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             initEventFlags();
         }
 
+        /// <summary>
+        /// Make sure our object does not timeout when in AppDomain. (Called by ILease base class)
+        /// </summary>
+        /// <returns></returns>
+        public override Object InitializeLifetimeService()
+        {
+            //m_log.Debug("Executor: InitializeLifetimeService()");
+            //            return null;
+            ILease lease = (ILease)base.InitializeLifetimeService();
+
+            if (lease.CurrentState == LeaseState.Initial)
+            {
+                lease.InitialLeaseTime = TimeSpan.Zero; // TimeSpan.FromMinutes(1);
+                //                lease.SponsorshipTimeout = TimeSpan.FromMinutes(2);
+                //                lease.RenewOnCallTime = TimeSpan.FromSeconds(2);
+            }
+            return lease;
+        }
+
+
         public scriptEvents GetStateEventFlags(string state)
         {
             //m_log.Debug("Get event flags for " + state);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 753ca55..9068634 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -32,7 +32,7 @@ using LSLInteger = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
 
 namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
 {
-    public partial class ScriptBaseClass
+    public partial class ScriptBaseClass : MarshalByRefObject
     {
         // LSL CONSTANTS
         public static readonly LSLInteger TRUE = new LSLInteger(1);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
index d119a77..964fe4c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
@@ -26,7 +26,6 @@
  */
 
 using System;
-using System.Runtime.Remoting;
 using System.Runtime.Remoting.Lifetime;
 using System.Security.Permissions;
 using System.Threading;
@@ -35,23 +34,26 @@ using System.Collections;
 using System.Collections.Generic;
 using OpenSim.Region.ScriptEngine.Interfaces;
 using OpenSim.Region.ScriptEngine.Shared;
-using OpenSim.Region.ScriptEngine.Shared.Api.Runtime;
 
 namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
 {
     public partial class ScriptBaseClass : MarshalByRefObject, IScript
     {
         private Dictionary<string, MethodInfo> inits = new Dictionary<string, MethodInfo>();
-        private ScriptSponsor m_sponser;
 
+        // Object expires if we don't keep it alive
+        // sponsor will be added on object load
+        [SecurityPermissionAttribute(SecurityAction.Demand,
+                             Flags = SecurityPermissionFlag.Infrastructure)]
         public override Object InitializeLifetimeService()
         {
             ILease lease = (ILease)base.InitializeLifetimeService();
             if (lease.CurrentState == LeaseState.Initial)
             {
-                lease.InitialLeaseTime = TimeSpan.FromMinutes(1.0);
-                lease.RenewOnCallTime = TimeSpan.FromSeconds(10.0);
-                lease.SponsorshipTimeout = TimeSpan.FromMinutes(1.0);
+                lease.InitialLeaseTime = TimeSpan.Zero;
+//                lease.InitialLeaseTime = TimeSpan.FromMinutes(1);
+//                lease.SponsorshipTimeout = TimeSpan.FromMinutes(2);
+//                lease.RenewOnCallTime = TimeSpan.FromSeconds(2);
             }
             return lease;
         }
@@ -64,6 +66,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         }
 #endif
 
+
         public ScriptBaseClass()
         {
             m_Executor = new Executor(this);
@@ -78,8 +81,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
                     inits[type] = mi;
                 }
             }
-
-            m_sponser = new ScriptSponsor();
         }
 
         private Executor m_Executor = null;
@@ -111,9 +112,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             if (!inits.ContainsKey(api))
                 return;
 
-            ILease lease = (ILease)RemotingServices.GetLifetimeService(data as MarshalByRefObject);
-            lease.Register(m_sponser);
-
             MethodInfo mi = inits[api];
 
             Object[] args = new Object[1];
@@ -124,11 +122,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_InitialValues = GetVars();
         }
 
-        public void Close()
-        {
-            m_sponser.Close();
-        }
-
         public Dictionary<string, object> GetVars()
         {
             Dictionary<string, object> vars = new Dictionary<string, object>();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptSponsor.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptSponsor.cs
index 977ac30..a2da14e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptSponsor.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptSponsor.cs
@@ -32,19 +32,15 @@ using System.Text;
 
 namespace OpenSim.Region.ScriptEngine.Shared.Api.Runtime
 {
+    [Serializable]
     public class ScriptSponsor : MarshalByRefObject, ISponsor
     {
-        private bool m_closed = false;
-
+        // In theory: I execute, therefore I am.
+        // If GC collects this class then sponsorship will expire
         public TimeSpan Renewal(ILease lease)
         {
-            if (!m_closed)
-                return lease.InitialLeaseTime;
-            return TimeSpan.FromTicks(0);
+            return TimeSpan.FromMinutes(2);
         }
-
-        public void Close() { m_closed = true; }
-
 #if DEBUG
         // For tracing GC while debugging
         public static bool GCDummy = false;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 6d62249..8168300 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -96,8 +96,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
         private string m_CurrentState = String.Empty;
         private UUID m_RegionID = UUID.Zero;
 
-        private ScriptSponsor m_ScriptSponsor;
-        private bool m_destroyed = false;
+        //private ISponsor m_ScriptSponsor;
         private Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>>
                 m_LineMap;
 
@@ -262,9 +261,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                     Path.GetFileNameWithoutExtension(assembly),
                     "SecondLife.Script");
 
-                m_ScriptSponsor = new ScriptSponsor();
-                ILease lease = (ILease)RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass);
-                lease.Register(m_ScriptSponsor);
+                // Add a sponsor to the script
+//                ISponsor scriptSponsor = new ScriptSponsor();
+//                ILease lease = (ILease)RemotingServices.GetLifetimeService(m_Script as MarshalByRefObject);
+//                lease.Register(scriptSponsor);
+                //m_ScriptSponsor = scriptSponsor;
+
             }
             catch (Exception)
             {
@@ -447,13 +449,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
         {
             ReleaseControls();
             AsyncCommandManager.RemoveScript(m_Engine, m_LocalID, m_ItemID);
-
-            m_Script.Close();
-            m_ScriptSponsor.Close();
-            ILease lease = (ILease)RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass);
-            lease.Unregister(m_ScriptSponsor);
-
-            m_destroyed = true;
         }
 
         public void RemoveState()
@@ -889,8 +884,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
         public void SaveState(string assembly)
         {
-
-
             // If we're currently in an event, just tell it to save upon return
             //
             if (m_InEvent)
@@ -899,10 +892,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                 return;
             }
 
-            // Data may not be available as the script has already been destroyed
-            if (m_destroyed == true)
-                return;
-
             PluginData = AsyncCommandManager.GetSerializationData(m_Engine, m_ItemID);
 
             string xml = ScriptSerializer.Serialize(this);
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index ff75e2f..c7673c7 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -272,10 +272,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                     instance.ClearQueue();
                     instance.Stop(0);
 
-                    // Release events, timer, etc
-                    //
-                    instance.DestroyScriptInstance();
-
                     // Unload scripts and app domains
                     // Must be done explicitly because they have infinite
                     // lifetime
@@ -286,6 +282,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                         m_DomainScripts.Remove(instance.AppDomain);
                         UnloadAppDomain(instance.AppDomain);
                     }
+
+                    // Release events, timer, etc
+                    //
+                    instance.DestroyScriptInstance();
                 }
                 m_Scripts.Clear();
                 m_PrimObjects.Clear();
@@ -802,9 +802,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                     }
                 }
 
-                instance.RemoveState();
-                instance.DestroyScriptInstance();
-
                 m_DomainScripts[instance.AppDomain].Remove(instance.ItemID);
                 if (m_DomainScripts[instance.AppDomain].Count == 0)
                 {
@@ -812,6 +809,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                     UnloadAppDomain(instance.AppDomain);
                 }
 
+                instance.RemoveState();
+                instance.DestroyScriptInstance();
+
                 instance = null;
 
                 ObjectRemoved handlerObjectRemoved = OnObjectRemoved;