OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Actually set the PrivateBinPath in XEngine so relocating the scripts 

directory works
avinationmerge
Melanie 2010-10-16 10:50:07 +02:00
parent 537905d81b
commit efc555ca22
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
View File

@ -56,7 +56,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
{ {
public class ScriptInstance : MarshalByRefObject, IScriptInstance public class ScriptInstance : MarshalByRefObject, IScriptInstance
{ {
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private IScriptEngine m_Engine; private IScriptEngine m_Engine;
private IScriptWorkItem m_CurrentResult = null; private IScriptWorkItem m_CurrentResult = null;
@ -271,9 +271,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
//RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass); //RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass);
// lease.Register(this); // lease.Register(this);
} }
catch (Exception) catch (Exception e)
{ {
// m_log.ErrorFormat("[Script] Error loading assembly {0}\n"+e.ToString(), assembly); m_log.ErrorFormat("[Script] Error loading assembly {0}\n"+e.ToString(), assembly);
throw;
} }
try try

6
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@ -794,9 +794,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
try try
{ {
AppDomainSetup appSetup = new AppDomainSetup(); AppDomainSetup appSetup = new AppDomainSetup();
// appSetup.ApplicationBase = Path.Combine( appSetup.PrivateBinPath = Path.Combine(
// "ScriptEngines", m_ScriptEnginesPath,
// m_Scene.RegionInfo.RegionID.ToString()); m_Scene.RegionInfo.RegionID.ToString());
Evidence baseEvidence = AppDomain.CurrentDomain.Evidence; Evidence baseEvidence = AppDomain.CurrentDomain.Evidence;
Evidence evidence = new Evidence(baseEvidence); Evidence evidence = new Evidence(baseEvidence);