From 17e7e9b354509b275091418adc7255de2d5f38df Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 19 Jun 2020 21:17:26 +0100 Subject: [PATCH] enable threat check on the new ossl method --- .../Region/CoreModules/World/LightShare/EnvironmentModule.cs | 3 +++ .../ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 5 ++--- bin/config-include/osslDefaultEnable.ini | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs b/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs index aeada96691..c4cb6cfb88 100644 --- a/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs +++ b/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs @@ -483,10 +483,13 @@ namespace OpenSim.Region.CoreModules.World.LightShare VEnv = land.LandData.Environment; else { + /* not working for some reason OSD def = ViewerEnvironment.DefaultToOSD(regionID, parcel); httpResponse.RawBuffer = OSDParser.SerializeLLSDXmlToBytes(def); httpResponse.StatusCode = (int)HttpStatusCode.OK; return; + */ + VEnv = GetRegionEnvironment(); } } diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 8e9ac56fa7..efcfb84754 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -5886,9 +5886,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_Integer osReplaceAgentEnvironment(LSL_Key agentkey, LSL_Integer transition, LSL_String environment) { m_host.AddScriptLPS(1); -// if(!string.IsNullOrEmpty(CheckThreatLevelTest(ThreatLevel.Moderate, "osReplaceAgentEnvironment"))) -// return -2; - + if(!string.IsNullOrEmpty(CheckThreatLevelTest(ThreatLevel.Moderate, "osReplaceAgentEnvironment"))) + return -2; if (!UUID.TryParse(agentkey, out UUID agentid)) return -4; diff --git a/bin/config-include/osslDefaultEnable.ini b/bin/config-include/osslDefaultEnable.ini index e66577dbcf..dfaa1beff9 100644 --- a/bin/config-include/osslDefaultEnable.ini +++ b/bin/config-include/osslDefaultEnable.ini @@ -142,6 +142,7 @@ Allow_osGetSimulatorMemory = ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER Allow_osGetSimulatorMemoryKB = ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER Allow_osMessageAttachments = ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER + Allow_osReplaceAgentEnvironment = ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER Allow_osSetSpeed = ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER Allow_osSetOwnerSpeed = ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER Allow_osRequestURL = ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER