2 files changed, 25 insertions, 5 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
index 25c823d..06307bb 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.Runtime.Remoting.Lifetime;
+using System.Security.Permissions;
 using System.Threading;
 using System.Reflection;
 using System.Collections;
@@ -40,16 +41,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
     {
         private Dictionary<string,MethodInfo> inits = new Dictionary<string,MethodInfo>();
 
-        //
-        // Never expire this object
-        //
+        // 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.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/Api/Runtime/ScriptSponsor.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptSponsor.cs
new file mode 100644
index 0000000..87401bb
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptSponsor.cs
@@ -0,0 +1,17 @@
+using System;

+using System.Collections.Generic;

+using System.Runtime.Remoting.Lifetime;

+using System.Text;

+

+namespace OpenSim.Region.ScriptEngine.Shared.Api.Runtime

+{

+    public class ScriptSponsor: ISponsor

+    {

+        // In theory: I execute, therefore I am.

+        // If GC collects this class then sponsorship will expire

+        public TimeSpan Renewal(ILease lease)

+        {

+            return TimeSpan.FromMinutes(2);

+        }

+    }

+}