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/Instance | |
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/Instance')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 4211ced..225126d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
@@ -53,7 +53,7 @@ using OpenSim.Region.ScriptEngine.Interfaces; | |||
53 | 53 | ||
54 | namespace OpenSim.Region.ScriptEngine.Shared.Instance | 54 | namespace OpenSim.Region.ScriptEngine.Shared.Instance |
55 | { | 55 | { |
56 | public class ScriptInstance : MarshalByRefObject, IScriptInstance, ISponsor | 56 | public class ScriptInstance : MarshalByRefObject, IScriptInstance |
57 | { | 57 | { |
58 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 58 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
59 | 59 | ||
@@ -261,7 +261,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
261 | "SecondLife.Script"); | 261 | "SecondLife.Script"); |
262 | 262 | ||
263 | ILease lease = (ILease)RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass); | 263 | ILease lease = (ILease)RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass); |
264 | lease.Register(this); | 264 | // lease.Register(this); |
265 | } | 265 | } |
266 | catch (Exception) | 266 | catch (Exception) |
267 | { | 267 | { |
@@ -1006,10 +1006,5 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
1006 | { | 1006 | { |
1007 | return true; | 1007 | return true; |
1008 | } | 1008 | } |
1009 | |||
1010 | public TimeSpan Renewal(ILease lease) | ||
1011 | { | ||
1012 | return lease.InitialLeaseTime; | ||
1013 | } | ||
1014 | } | 1009 | } |
1015 | } | 1010 | } |