From 273e1f0917d8ff125b3bf885f6eb80d32bf7b840 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Tue, 22 Nov 2016 17:01:47 +1000
Subject: Don't throw exceptions on threat level checks and a few other script
 function errors.

Instead, just complain quickly and return without doing the function.
---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 0b60aee..1399880 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -11660,7 +11660,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         break;
                     case ScriptBaseClass.DATA_SIM_RELEASE:
                         if (ossl != null)
-                            ossl.CheckThreatLevel(ThreatLevel.High, "llRequestSimulatorData");
+                        {
+//// TODO - double check this.
+                            if (!ossl.CheckThreatLevel(ThreatLevel.High, "llRequestSimulatorData"))
+                                return UUID.Zero.ToString(); // Raise no event
+                        }
                         reply = "OpenSim";
                         break;
                     default:
-- 
cgit v1.1