From 7258531e3ba8ebdb1e9cc738720a79ca6602ee9a Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Mon, 26 Nov 2018 19:57:42 +0000
Subject: show prim ID on script error

---
 OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 1 +
 OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs             | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index a98311e..8cc48bd 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -929,6 +929,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                                     string text = e.InnerException.Message +
                                                 "(script: " + ScriptName +
                                                 " event: " + data.EventName +
+                                                " primID:" + Part.UUID.ToString() +
                                                 " at " + Part.AbsolutePosition + ")";
                                     if (text.Length > 1000)
                                         text = text.Substring(0, 1000);
diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs b/OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs
index 1e5416f..7a95a4a 100644
--- a/OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs
+++ b/OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs
@@ -492,13 +492,12 @@ namespace OpenSim.Region.ScriptEngine.Yengine
             if (e.Message != null)
                 msg.Append(e.Message);
 
-            msg.Append(" (prim: ");
-            msg.Append(m_Part.Name);
-
             msg.Append(" script: ");
             msg.Append(m_Item.Name);
             msg.Append(" event: ");
             msg.Append(ev.ToString());
+            msg.Append(" (primID: ");
+            msg.Append(m_Part.UUID.ToString());
             msg.Append(" at: <");
             Vector3 pos = m_Part.AbsolutePosition;
             msg.Append((int)Math.Floor(pos.X));
-- 
cgit v1.1