aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
diff options
context:
space:
mode:
authorMelanie2009-08-07 20:43:23 +0100
committerMelanie2009-08-07 20:43:23 +0100
commit4ee8d8a813f6ee164fb361fbf6c26384b668bd1a (patch)
tree73d8679ede11b3dcc13239f149d8e385e0431b15 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
parentTemporailiy add some info output in config load (diff)
downloadopensim-SC_OLD-4ee8d8a813f6ee164fb361fbf6c26384b668bd1a.zip
opensim-SC_OLD-4ee8d8a813f6ee164fb361fbf6c26384b668bd1a.tar.gz
opensim-SC_OLD-4ee8d8a813f6ee164fb361fbf6c26384b668bd1a.tar.bz2
opensim-SC_OLD-4ee8d8a813f6ee164fb361fbf6c26384b668bd1a.tar.xz
Another stab at cmickeyb's patch for script GC.
Moved the Close() for the appdomain-hosted parts into a new destructor on ScriptInstance.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs7
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 967b835..bf86eeb 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -159,16 +159,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
159 } 159 }
160 } 160 }
161 161
162 //
163 // Never expire this object
164 //
165 public override Object InitializeLifetimeService() 162 public override Object InitializeLifetimeService()
166 { 163 {
167 ILease lease = (ILease)base.InitializeLifetimeService(); 164 ILease lease = (ILease)base.InitializeLifetimeService();
168 165
169 if (lease.CurrentState == LeaseState.Initial) 166 if (lease.CurrentState == LeaseState.Initial)
170 { 167 {
171 lease.InitialLeaseTime = TimeSpan.Zero; 168 lease.InitialLeaseTime = TimeSpan.FromMinutes(1.0);
169 lease.RenewOnCallTime = TimeSpan.FromSeconds(10.0);
170 lease.SponsorshipTimeout = TimeSpan.FromMinutes(1.0);
172 } 171 }
173 return lease; 172 return lease;
174 } 173 }