aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-27 05:31:43 +0000
committerMelanie Thielker2008-09-27 05:31:43 +0000
commit85068dae60db02b168a29ffd75e1408e30d279e1 (patch)
tree8389c246a6e9891eb1bf310b85cba19a1668d790 /OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
parentMantis #2277 (diff)
downloadopensim-SC-85068dae60db02b168a29ffd75e1408e30d279e1.zip
opensim-SC-85068dae60db02b168a29ffd75e1408e30d279e1.tar.gz
opensim-SC-85068dae60db02b168a29ffd75e1408e30d279e1.tar.bz2
opensim-SC-85068dae60db02b168a29ffd75e1408e30d279e1.tar.xz
Add friendly error messages to both engines.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine/XEngine.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index a37cbb4..6bafd69 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
59 private int m_MaxScriptQueue; 59 private int m_MaxScriptQueue;
60 private Scene m_Scene; 60 private Scene m_Scene;
61 private IConfig m_ScriptConfig; 61 private IConfig m_ScriptConfig;
62 private Compiler m_Compiler; 62 private ICompiler m_Compiler;
63 private int m_MinThreads; 63 private int m_MinThreads;
64 private int m_MaxThreads ; 64 private int m_MaxThreads ;
65 private int m_IdleTimeout; 65 private int m_IdleTimeout;
@@ -510,7 +510,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
510 try 510 try
511 { 511 {
512 // DISPLAY ERROR INWORLD 512 // DISPLAY ERROR INWORLD
513 string text = "Error compiling script:\r\n" + e.Message.ToString(); 513 string text = "Error compiling script:\n" + e.ToString();
514 if (text.Length > 1000) 514 if (text.Length > 1000)
515 text = text.Substring(0, 1000); 515 text = text.Substring(0, 1000);
516 World.SimChat(Utils.StringToBytes(text), 516 World.SimChat(Utils.StringToBytes(text),
@@ -585,6 +585,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
585 part.ParentGroup.RootPart.Name, item.Name); 585 part.ParentGroup.RootPart.Name, item.Name);
586 586
587 instance.AppDomain = appDomain; 587 instance.AppDomain = appDomain;
588 instance.LineMap = m_Compiler.LineMap();
588 589
589 m_Scripts[itemID] = instance; 590 m_Scripts[itemID] = instance;
590 } 591 }