OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

a few more changes

0.9.1.0-post-fixes
UbitUmarov 2018-11-26 20:20:28 +00:00
parent 7258531e3b
commit 0307427b94
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
View File

@ -938,7 +938,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
Part.AbsolutePosition,
Part.Name, Part.UUID, false);
m_log.Debug(string.Format(
"[SCRIPT INSTANCE]: {0} (at event {1}, part {2} {3} at {4} in {5}",
"[SCRIPT ERROR]: {0} (at event {1}, part {2} {3} at {4} in {5}",
e.InnerException.Message,
data.EventName,
PrimName,
@ -962,7 +962,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
m_log.Debug(string.Format(
"[SCRIPT INSTANCE]: Runtime error in script {0} (event {1}), part {2} {3} at {4} in {5} ",
"[SCRIPT ERROR]: Runtime error in script {0} (event {1}), part {2} {3} at {4} in {5} ",
ScriptName,
data.EventName,
PrimName,

14
OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs
View File

@ -492,11 +492,11 @@ namespace OpenSim.Region.ScriptEngine.Yengine
if (e.Message != null)
msg.Append(e.Message);
msg.Append(" script: ");
msg.Append(" (script: ");
msg.Append(m_Item.Name);
msg.Append(" event: ");
msg.Append(ev.ToString());
msg.Append(" (primID: ");
msg.Append(" primID: ");
msg.Append(m_Part.UUID.ToString());
msg.Append(" at: <");
Vector3 pos = m_Part.AbsolutePosition;
@ -511,11 +511,19 @@ namespace OpenSim.Region.ScriptEngine.Yengine
if (msgst.Length > 1000)
msgst = msgst.Substring(0, 1000);
m_log.Info(msgst);
m_Engine.World.SimChat(Utils.StringToBytes(msgst),
ChatTypeEnum.DebugChannel, 2147483647,
m_Part.AbsolutePosition,
m_Part.Name, m_Part.UUID, false);
m_log.Debug(string.Format(
"[SCRIPT ERROR]: {0} (at event {1}, part {2} {3} at {4} in {5}",
(e.Message == null)? "" : e.Message,
ev.ToString(),
m_Part.Name,
m_Part.UUID,
m_Part.AbsolutePosition,
m_Part.ParentGroup.Scene.Name));
m_SleepUntil = DateTime.MaxValue;
}