aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorMelanie2009-10-09 17:23:18 +0100
committerMelanie2009-10-09 17:23:18 +0100
commit527c94825b733fe0aaf0d2a08eb9e5b16d5db6c6 (patch)
tree1ecc6ce479e3041769112fec9805b11245880079 /OpenSim/Region/ScriptEngine
parentSlow down the packet receiving code again after new reports of thread storms. (diff)
parentMerge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-527c94825b733fe0aaf0d2a08eb9e5b16d5db6c6.zip
opensim-SC-527c94825b733fe0aaf0d2a08eb9e5b16d5db6c6.tar.gz
opensim-SC-527c94825b733fe0aaf0d2a08eb9e5b16d5db6c6.tar.bz2
opensim-SC-527c94825b733fe0aaf0d2a08eb9e5b16d5db6c6.tar.xz
Merge branch 'master' into htb-throttle
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-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),