From d9afe354ac90c9a9b75f2ff05f3b8180225334fb Mon Sep 17 00:00:00 2001 From: Talun Date: Tue, 19 May 2015 19:07:48 +0100 Subject: New values returned by llGetEnv Implements recent changes to llGetEnv region_cpu_ratio hardcoded to 1 region_product_sku hardcoded to OpenSim Signed-off-by: Michael Cerquoni --- .../Shared/Api/Implementation/LSL_Api.cs | 34 +++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) (limited to 'OpenSim/Region/ScriptEngine/Shared/Api') diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 089a5a8..8359440 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -5785,7 +5785,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_String llGetEnv(LSL_String name) { m_host.AddScriptLPS(1); - if (name == "dynamic_pathfinding") + if (name == "agent_limit") + { + return World.RegionInfo.RegionSettings.AgentLimit.ToString(); + } + else if (name == "dynamic_pathfinding") { return "0"; } @@ -5793,14 +5797,37 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { return World.RegionInfo.EstateSettings.EstateID.ToString(); } + else if (name == "estate_name") + { + return World.RegionInfo.EstateSettings.EstateName; + } else if (name == "frame_number") { return World.Frame.ToString(); } + else if (name == "region_cpu_ratio") + { + return "1"; + } else if (name == "region_idle") { return "0"; } + else if (name == "region_product_name") + { + if (World.RegionInfo.RegionType != String.Empty) + return World.RegionInfo.RegionType; + else + return ""; + } + else if (name == "region_product_sku") + { + return "OpenSim"; + } + else if (name == "region_start_time") + { + return World.UnixStartTime.ToString(); + } else if (name == "sim_channel") { return "OpenSim"; @@ -5809,6 +5836,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { return World.GetSimulatorVersion(); } + else if (name == "simulator_hostname") + { + IUrlModule UrlModule = World.RequestModuleInterface(); + return UrlModule.ExternalHostNameForLSL; + } else { return ""; -- cgit v1.1