diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-14 14:16:02 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-14 14:16:02 -0400 |
| commit | 755464170300e89bc92b5b4b8f1c22f14161d75d (patch) | |
| tree | a5441ddc4496b00a927d5fbe9ffcf614635a5cd2 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |
| parent | * allocate the dictionary for AgentCircuitData.ChildrenCapSeeds when creating... (diff) | |
| parent | Remove NRE catching on TestReplicateArchivePathToUserInventory() since race f... (diff) | |
| download | opensim-SC-755464170300e89bc92b5b4b8f1c22f14161d75d.zip opensim-SC-755464170300e89bc92b5b4b8f1c22f14161d75d.tar.gz opensim-SC-755464170300e89bc92b5b4b8f1c22f14161d75d.tar.bz2 opensim-SC-755464170300e89bc92b5b4b8f1c22f14161d75d.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 6 |
1 files changed, 3 insertions, 3 deletions
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 | } |