diff options
| author | Melanie | 2009-10-12 15:11:01 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-12 15:11:01 +0100 |
| commit | 50f509d600dd0fe172d5c026a42e229fbcdc3fcd (patch) | |
| tree | 847569e552590333b2d1cb837705050c029cd797 /OpenSim/Region/ScriptEngine | |
| parent | Merge branch 'master' into vehicles (diff) | |
| parent | Fix selling objects (diff) | |
| download | opensim-SC-50f509d600dd0fe172d5c026a42e229fbcdc3fcd.zip opensim-SC-50f509d600dd0fe172d5c026a42e229fbcdc3fcd.tar.gz opensim-SC-50f509d600dd0fe172d5c026a42e229fbcdc3fcd.tar.bz2 opensim-SC-50f509d600dd0fe172d5c026a42e229fbcdc3fcd.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 2 |
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), |