diff options
author | Melanie | 2009-08-07 03:04:06 +0100 |
---|---|---|
committer | Melanie | 2009-08-07 03:04:06 +0100 |
commit | f8d8366bfa6f048107d22b4b73af22803810be81 (patch) | |
tree | 185a7ccc461a03366e1dade1a6f4ecf5d2c8f4f4 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation | |
parent | Remove the forge module patch insertion area from prebuild.xml (diff) | |
download | opensim-SC-f8d8366bfa6f048107d22b4b73af22803810be81.zip opensim-SC-f8d8366bfa6f048107d22b4b73af22803810be81.tar.gz opensim-SC-f8d8366bfa6f048107d22b4b73af22803810be81.tar.bz2 opensim-SC-f8d8366bfa6f048107d22b4b73af22803810be81.tar.xz |
Revert the XEngine memleak patch, it causes premature GC.
This matches behavior seen with an earlier attempt to do this, apparently
the sponsor mechanism does't work in Mono
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 7 |
2 files changed, 6 insertions, 6 deletions
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 | |||
119 | AsyncCommands = new AsyncCommandManager(ScriptEngine); | 119 | AsyncCommands = new AsyncCommandManager(ScriptEngine); |
120 | } | 120 | } |
121 | 121 | ||
122 | // Object never expires | ||
122 | public override Object InitializeLifetimeService() | 123 | public override Object InitializeLifetimeService() |
123 | { | 124 | { |
124 | ILease lease = (ILease)base.InitializeLifetimeService(); | 125 | ILease lease = (ILease)base.InitializeLifetimeService(); |
125 | 126 | ||
126 | if (lease.CurrentState == LeaseState.Initial) | 127 | if (lease.CurrentState == LeaseState.Initial) |
127 | { | 128 | { |
128 | lease.InitialLeaseTime = TimeSpan.FromMinutes(1.0); | 129 | lease.InitialLeaseTime = TimeSpan.Zero; |
129 | lease.RenewOnCallTime = TimeSpan.FromSeconds(10.0); | ||
130 | lease.SponsorshipTimeout = TimeSpan.FromMinutes(1.0); | ||
131 | } | 130 | } |
132 | return lease; | 131 | return lease; |
133 | } | 132 | } |
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 | |||
159 | } | 159 | } |
160 | } | 160 | } |
161 | 161 | ||
162 | // | ||
163 | // Never expire this object | ||
164 | // | ||
162 | public override Object InitializeLifetimeService() | 165 | public override Object InitializeLifetimeService() |
163 | { | 166 | { |
164 | ILease lease = (ILease)base.InitializeLifetimeService(); | 167 | ILease lease = (ILease)base.InitializeLifetimeService(); |
165 | 168 | ||
166 | if (lease.CurrentState == LeaseState.Initial) | 169 | if (lease.CurrentState == LeaseState.Initial) |
167 | { | 170 | { |
168 | lease.InitialLeaseTime = TimeSpan.FromMinutes(1.0); | 171 | lease.InitialLeaseTime = TimeSpan.Zero; |
169 | lease.RenewOnCallTime = TimeSpan.FromSeconds(10.0); | ||
170 | lease.SponsorshipTimeout = TimeSpan.FromMinutes(1.0); | ||
171 | } | 172 | } |
172 | return lease; | 173 | return lease; |
173 | } | 174 | } |