From 4eee4764235db2836db5c30bcc3ba96838bdf95f Mon Sep 17 00:00:00 2001 From: Vincent Sylvester Date: Sat, 8 Aug 2020 07:43:57 +0200 Subject: [PATCH] osSetParcelMusicURL Signed-off-by: UbitUmarov --- .../Shared/Api/Implementation/OSSL_Api.cs | 13 +++++++++++-- .../ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 1 + .../ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 5 +++++ bin/config-include/osslDefaultEnable.ini | 1 + 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 3ab85b5ed5..ccff6657e1 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -1979,7 +1979,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } } - public void osSetParcelMediaURL(string url) + public void osSetParcelMusicURL(string url) + { + CheckThreatLevel(ThreatLevel.VeryLow, "osSetParcelMusicURL"); + + ILandObject land = World.LandChannel.GetLandObject(m_host.AbsolutePosition); + + land.SetMusicUrl(url); + + } + public void osSetParcelMediaURL(string url) { // What actually is the difference to the LL function? // @@ -6096,4 +6105,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return 1; } } -} \ No newline at end of file +} diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 6be5022d50..a2ac60f9c4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs @@ -142,6 +142,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces void osRegionNotice(string msg); void osRegionNotice(LSL_Key agentID, string msg); bool osConsoleCommand(string Command); + void osSetParcelMusicURL(string url); void osSetParcelMediaURL(string url); void osSetPrimFloatOnWater(int floatYN); void osSetParcelSIPAddress(string SIPAddress); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index c0d7def32c..2290bba9cf 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs @@ -235,6 +235,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase return m_OSSL_Functions.osConsoleCommand(Command); } + public void osSetParcelMusicURL(string url) + { + m_OSSL_Functions.osSetParcelMusicURL(url); + } + public void osSetParcelMediaURL(string url) { m_OSSL_Functions.osSetParcelMediaURL(url); diff --git a/bin/config-include/osslDefaultEnable.ini b/bin/config-include/osslDefaultEnable.ini index dfaa1beff9..25e24a0244 100644 --- a/bin/config-include/osslDefaultEnable.ini +++ b/bin/config-include/osslDefaultEnable.ini @@ -105,6 +105,7 @@ Allow_osSetDynamicTextureDataBlend = ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER Allow_osSetDynamicTextureDataBlendFace = ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER Allow_osSetParcelMediaURL = ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER + Allow_osSetParcelMusicURL = ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER Allow_osSetParcelSIPAddress = ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER Allow_osSetPrimFloatOnWater = true Allow_osSetWindParam = ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER