aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
diff options
context:
space:
mode:
authorDavid Walter Seikel2016-11-22 17:01:47 +1000
committerDavid Walter Seikel2016-11-22 17:01:47 +1000
commit273e1f0917d8ff125b3bf885f6eb80d32bf7b840 (patch)
tree64b4dc930b60021b98350039c129e4d2b4797a1e /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
parentActually tell us what the problem object is with sculpties in map generation. (diff)
downloadopensim-SC_OLD-273e1f0917d8ff125b3bf885f6eb80d32bf7b840.zip
opensim-SC_OLD-273e1f0917d8ff125b3bf885f6eb80d32bf7b840.tar.gz
opensim-SC_OLD-273e1f0917d8ff125b3bf885f6eb80d32bf7b840.tar.bz2
opensim-SC_OLD-273e1f0917d8ff125b3bf885f6eb80d32bf7b840.tar.xz
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.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs6
1 files changed, 5 insertions, 1 deletions
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
11660 break; 11660 break;
11661 case ScriptBaseClass.DATA_SIM_RELEASE: 11661 case ScriptBaseClass.DATA_SIM_RELEASE:
11662 if (ossl != null) 11662 if (ossl != null)
11663 ossl.CheckThreatLevel(ThreatLevel.High, "llRequestSimulatorData"); 11663 {
11664//// TODO - double check this.
11665 if (!ossl.CheckThreatLevel(ThreatLevel.High, "llRequestSimulatorData"))
11666 return UUID.Zero.ToString(); // Raise no event
11667 }
11664 reply = "OpenSim"; 11668 reply = "OpenSim";
11665 break; 11669 break;
11666 default: 11670 default: