aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-29 11:20:06 +0000
committerMelanie Thielker2008-11-29 11:20:06 +0000
commita00d346aab932e4c0905578487e7640debdc1a16 (patch)
tree8a9ef968972c276d28cda4d25e5ef951e7b3fdf5 /OpenSim/Region/ScriptEngine/Shared
parentUpdate meshing code to sync with current PrimMesher.cs on forge. (diff)
downloadopensim-SC_OLD-a00d346aab932e4c0905578487e7640debdc1a16.zip
opensim-SC_OLD-a00d346aab932e4c0905578487e7640debdc1a16.tar.gz
opensim-SC_OLD-a00d346aab932e4c0905578487e7640debdc1a16.tar.bz2
opensim-SC_OLD-a00d346aab932e4c0905578487e7640debdc1a16.tar.xz
Add the lifetime management back into the LSL_Api, since that will also
expire and take the scripts down
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs12
1 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 77dcc6f..17dca98 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -29,7 +29,6 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Runtime.Remoting.Lifetime; 31using System.Runtime.Remoting.Lifetime;
32using System.Security.Permissions;
33using System.Text; 32using System.Text;
34using System.Threading; 33using System.Threading;
35using Nini.Config; 34using Nini.Config;
@@ -99,8 +98,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
99 AsyncCommands = new AsyncCommandManager(ScriptEngine); 98 AsyncCommands = new AsyncCommandManager(ScriptEngine);
100 } 99 }
101 100
101 // Object never expires
102 public override Object InitializeLifetimeService()
103 {
104 ILease lease = (ILease)base.InitializeLifetimeService();
102 105
103 106 if (lease.CurrentState == LeaseState.Initial)
107 {
108 lease.InitialLeaseTime = TimeSpan.Zero;
109 }
110 return lease;
111 }
104 112
105 protected void ScriptSleep(int delay) 113 protected void ScriptSleep(int delay)
106 { 114 {