38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
|
From 0ebae25f7c208045b32c4da1f080cb157a7c234e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Christopher <christopher@clatza.dev>
|
||
|
|
Date: Wed, 17 Nov 2021 00:24:35 +0100
|
||
|
|
Subject: [PATCH] add try to ScriptDieException
|
||
|
|
|
||
|
|
---
|
||
|
|
OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs | 14 ++++++++++----
|
||
|
|
1 file changed, 10 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs b/OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs
|
||
|
|
index 2f60bcdc84..770229d8ab 100644
|
||
|
|
--- a/OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs
|
||
|
|
+++ b/OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs
|
||
|
|
@@ -545,10 +545,16 @@ namespace OpenSim.Region.ScriptEngine.Yengine
|
||
|
|
}
|
||
|
|
else if(e is ScriptDieException)
|
||
|
|
{
|
||
|
|
- // Script did an llDie()
|
||
|
|
- //m_RunOnePhase = "dying...";
|
||
|
|
- m_SleepUntil = DateTime.MaxValue;
|
||
|
|
- m_Engine.World.DeleteSceneObject(m_Part.ParentGroup, false);
|
||
|
|
+ try
|
||
|
|
+ {
|
||
|
|
+ // Script did an llDie()
|
||
|
|
+ //m_RunOnePhase = "dying...";
|
||
|
|
+ m_SleepUntil = DateTime.MaxValue;
|
||
|
|
+ m_Engine.World.DeleteSceneObject(m_Part.ParentGroup, false);
|
||
|
|
+ }catch(Exception error)
|
||
|
|
+ {
|
||
|
|
+ SendErrorMessage(error);
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
else if (e is ScriptResetException)
|
||
|
|
{
|
||
|
|
--
|
||
|
|
2.30.1.windows.1
|
||
|
|
|