diff options
| author | Teravus Ovares (Dan Olivares) | 2009-09-08 04:43:17 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-09-08 04:43:17 -0400 |
| commit | f0e2fd426b074ceb992124cf5eb2ebe8db5c04dd (patch) | |
| tree | bea9234644b05887b4c7cc063d457b91610ed9dc /OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |
| parent | * Fixes a 'take object from mega region' and rez it in a regular region.. ... (diff) | |
| parent | llRot2Euler() now returns angles -PI < angle < PI (diff) | |
| download | opensim-SC-f0e2fd426b074ceb992124cf5eb2ebe8db5c04dd.zip opensim-SC-f0e2fd426b074ceb992124cf5eb2ebe8db5c04dd.tar.gz opensim-SC-f0e2fd426b074ceb992124cf5eb2ebe8db5c04dd.tar.bz2 opensim-SC-f0e2fd426b074ceb992124cf5eb2ebe8db5c04dd.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 225126d..04f7862 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -260,7 +260,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 260 | Path.GetFileNameWithoutExtension(assembly), | 260 | Path.GetFileNameWithoutExtension(assembly), |
| 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 | RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass); | ||
| 264 | // lease.Register(this); | 265 | // lease.Register(this); |
| 265 | } | 266 | } |
| 266 | catch (Exception) | 267 | catch (Exception) |