ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Patch for mantis#1493: Several patches to xengine. Thanks Melanie!

Browse Source
This commit is contained in:
Adam Johnson
2008-06-07 17:43:07 +00:00
parent 2b83aa931c
commit 990225a4ba
5 changed files with 279 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/ScriptEngine/XEngine/Compiler.cs
View File

@@ -257,7 +257,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine
// FilePrefix + "_compiled_" + asset + ".dll");
if (File.Exists(OutFile))
{
m_scriptEngine.Log.DebugFormat("[XEngine] Returning existing assembly for {0}", asset);
return OutFile;
}
if (!Directory.Exists(ScriptEnginesPath))
{
@@ -422,9 +425,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine
string srcFileName = FilePrefix + "_source_" + Path.GetFileNameWithoutExtension(OutFile) + ext;
try
{
File.WriteAllText(
Path.Combine("ScriptEngines", srcFileName),
Script);
File.WriteAllText(Path.Combine(Path.Combine(
ScriptEnginesPath,
m_scriptEngine.World.RegionInfo.RegionID.ToString()),
srcFileName), Script);
}
catch (Exception ex) // NOTLEGIT - Should be just catching FileIOException
{
@@ -504,6 +508,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
errtext += "No compile error. But not able to locate compiled file.";
throw new Exception(errtext);
}
m_scriptEngine.Log.DebugFormat("[XEngine] Compiled new assembly for {0}", asset);
return OutFile;
}
}