diff options
author | Melanie | 2010-10-16 10:50:07 +0200 |
---|---|---|
committer | Melanie | 2010-10-16 10:50:07 +0200 |
commit | efc555ca225f05d1adfa8ed75f5802637bd76a9f (patch) | |
tree | 298fabe1b02312a0d70794d4f39bae4fae313ee4 /OpenSim | |
parent | Add a setter to OldItemID so it can be deserialized (diff) | |
download | opensim-SC-efc555ca225f05d1adfa8ed75f5802637bd76a9f.zip opensim-SC-efc555ca225f05d1adfa8ed75f5802637bd76a9f.tar.gz opensim-SC-efc555ca225f05d1adfa8ed75f5802637bd76a9f.tar.bz2 opensim-SC-efc555ca225f05d1adfa8ed75f5802637bd76a9f.tar.xz |
Actually set the PrivateBinPath in XEngine so relocating the scripts
directory works
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index b4da246..623cb7d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
@@ -56,7 +56,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
56 | { | 56 | { |
57 | public class ScriptInstance : MarshalByRefObject, IScriptInstance | 57 | public class ScriptInstance : MarshalByRefObject, IScriptInstance |
58 | { | 58 | { |
59 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 59 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
60 | 60 | ||
61 | private IScriptEngine m_Engine; | 61 | private IScriptEngine m_Engine; |
62 | private IScriptWorkItem m_CurrentResult = null; | 62 | private IScriptWorkItem m_CurrentResult = null; |
@@ -271,9 +271,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
271 | //RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass); | 271 | //RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass); |
272 | // lease.Register(this); | 272 | // lease.Register(this); |
273 | } | 273 | } |
274 | catch (Exception) | 274 | catch (Exception e) |
275 | { | 275 | { |
276 | // m_log.ErrorFormat("[Script] Error loading assembly {0}\n"+e.ToString(), assembly); | 276 | m_log.ErrorFormat("[Script] Error loading assembly {0}\n"+e.ToString(), assembly); |
277 | throw; | ||
277 | } | 278 | } |
278 | 279 | ||
279 | try | 280 | try |
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index c0ec0e8..35cc65b 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -794,9 +794,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
794 | try | 794 | try |
795 | { | 795 | { |
796 | AppDomainSetup appSetup = new AppDomainSetup(); | 796 | AppDomainSetup appSetup = new AppDomainSetup(); |
797 | // appSetup.ApplicationBase = Path.Combine( | 797 | appSetup.PrivateBinPath = Path.Combine( |
798 | // "ScriptEngines", | 798 | m_ScriptEnginesPath, |
799 | // m_Scene.RegionInfo.RegionID.ToString()); | 799 | m_Scene.RegionInfo.RegionID.ToString()); |
800 | 800 | ||
801 | Evidence baseEvidence = AppDomain.CurrentDomain.Evidence; | 801 | Evidence baseEvidence = AppDomain.CurrentDomain.Evidence; |
802 | Evidence evidence = new Evidence(baseEvidence); | 802 | Evidence evidence = new Evidence(baseEvidence); |