aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2009-10-09 17:43:25 +0100
committerJustin Clark-Casey (justincc)2009-10-09 17:43:25 +0100
commitf1f239758f10ee4dfa1360a5fc0aa98d025f9035 (patch)
treea60b505172d1757d0d7f82ed93d20e2b4ab23d88 /OpenSim/Region
parent* Apply http://opensimulator.org/mantis/view.php?id=3933 (diff)
downloadopensim-SC-f1f239758f10ee4dfa1360a5fc0aa98d025f9035.zip
opensim-SC-f1f239758f10ee4dfa1360a5fc0aa98d025f9035.tar.gz
opensim-SC-f1f239758f10ee4dfa1360a5fc0aa98d025f9035.tar.bz2
opensim-SC-f1f239758f10ee4dfa1360a5fc0aa98d025f9035.tar.xz
Apply http://opensimulator.org/mantis/view.php?id=4066
If XEngine compile fails, show script name in error message in-world as well as the exception itself Thanks Luca Peck
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index e695133..847da8c 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -642,7 +642,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
642 m_ScriptErrorMessage += "Failed to compile script in object: '" + part.ParentGroup.RootPart.Name + "' Script name: '" + item.Name + "' Error message: " + e.Message.ToString(); 642 m_ScriptErrorMessage += "Failed to compile script in object: '" + part.ParentGroup.RootPart.Name + "' Script name: '" + item.Name + "' Error message: " + e.Message.ToString();
643 643
644 m_ScriptFailCount++; 644 m_ScriptFailCount++;
645 string text = "Error compiling script:\n" + e.Message.ToString(); 645 string text = "Error compiling script '" + item.Name + "':\n" + e.Message.ToString();
646 if (text.Length > 1000) 646 if (text.Length > 1000)
647 text = text.Substring(0, 1000); 647 text = text.Substring(0, 1000);
648 World.SimChat(Utils.StringToBytes(text), 648 World.SimChat(Utils.StringToBytes(text),