diff options
| author | Adam Frisby | 2009-08-16 03:50:12 +1000 |
|---|---|---|
| committer | Adam Frisby | 2009-08-16 03:50:12 +1000 |
| commit | 8b6d79aa3c1ed6630933bafc1122aa78b8268908 (patch) | |
| tree | d956a4da2248b42fdb93d90c7b1c57ba8414732d /OpenSim/Region/ScriptEngine/Shared/Api/Implementation | |
| parent | * Beginnings of a Security Credential system in MRM. This will eventually lea... (diff) | |
| parent | * whoops, missing a / (diff) | |
| download | opensim-SC-8b6d79aa3c1ed6630933bafc1122aa78b8268908.zip opensim-SC-8b6d79aa3c1ed6630933bafc1122aa78b8268908.tar.gz opensim-SC-8b6d79aa3c1ed6630933bafc1122aa78b8268908.tar.bz2 opensim-SC-8b6d79aa3c1ed6630933bafc1122aa78b8268908.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 6 | ||||
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 6 |
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 ff85b96..691732a 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -125,9 +125,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 125 | 125 | ||
| 126 | if (lease.CurrentState == LeaseState.Initial) | 126 | if (lease.CurrentState == LeaseState.Initial) |
| 127 | { | 127 | { |
| 128 | lease.InitialLeaseTime = TimeSpan.FromMinutes(1.0); | 128 | lease.InitialLeaseTime = TimeSpan.FromMinutes(0); |
| 129 | lease.RenewOnCallTime = TimeSpan.FromSeconds(10.0); | 129 | // lease.RenewOnCallTime = TimeSpan.FromSeconds(10.0); |
| 130 | lease.SponsorshipTimeout = TimeSpan.FromMinutes(1.0); | 130 | // lease.SponsorshipTimeout = TimeSpan.FromMinutes(1.0); |
| 131 | } | 131 | } |
| 132 | return lease; | 132 | return lease; |
| 133 | } | 133 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 6539bda..6e3a3ab 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -166,9 +166,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 166 | 166 | ||
| 167 | if (lease.CurrentState == LeaseState.Initial) | 167 | if (lease.CurrentState == LeaseState.Initial) |
| 168 | { | 168 | { |
| 169 | lease.InitialLeaseTime = TimeSpan.FromMinutes(1.0); | 169 | lease.InitialLeaseTime = TimeSpan.FromMinutes(0); |
| 170 | lease.RenewOnCallTime = TimeSpan.FromSeconds(10.0); | 170 | // lease.RenewOnCallTime = TimeSpan.FromSeconds(10.0); |
| 171 | lease.SponsorshipTimeout = TimeSpan.FromMinutes(1.0); | 171 | // lease.SponsorshipTimeout = TimeSpan.FromMinutes(1.0); |
| 172 | } | 172 | } |
| 173 | return lease; | 173 | return lease; |
| 174 | } | 174 | } |