diff options
author | Melanie Thielker | 2008-11-29 11:20:06 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-29 11:20:06 +0000 |
commit | a00d346aab932e4c0905578487e7640debdc1a16 (patch) | |
tree | 8a9ef968972c276d28cda4d25e5ef951e7b3fdf5 /OpenSim/Region/ScriptEngine/Shared/Api | |
parent | Update meshing code to sync with current PrimMesher.cs on forge. (diff) | |
download | opensim-SC-a00d346aab932e4c0905578487e7640debdc1a16.zip opensim-SC-a00d346aab932e4c0905578487e7640debdc1a16.tar.gz opensim-SC-a00d346aab932e4c0905578487e7640debdc1a16.tar.bz2 opensim-SC-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/Api')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 12 |
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; | |||
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Runtime.Remoting.Lifetime; | 31 | using System.Runtime.Remoting.Lifetime; |
32 | using System.Security.Permissions; | ||
33 | using System.Text; | 32 | using System.Text; |
34 | using System.Threading; | 33 | using System.Threading; |
35 | using Nini.Config; | 34 | using 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 | { |