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/LSL_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_OLD-755464170300e89bc92b5b4b8f1c22f14161d75d.zip opensim-SC_OLD-755464170300e89bc92b5b4b8f1c22f14161d75d.tar.gz opensim-SC_OLD-755464170300e89bc92b5b4b8f1c22f14161d75d.tar.bz2 opensim-SC_OLD-755464170300e89bc92b5b4b8f1c22f14161d75d.tar.xz |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 6 |
1 files changed, 3 insertions, 3 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 | } |