From aff1593b2b522a93e9522c6455637d453629185e Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 3 Jan 2021 13:02:13 +0000 Subject: [PATCH] mantis 8844: fix PARCEL_MEDIA_COMMAND_URL with empty string parameter --- .../Shared/Api/Implementation/LSL_Api.cs | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 314f0bea7f..92305dbbec 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -13363,14 +13363,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (commandList.Data[i + 1] is LSL_String) { url = (LSL_String)commandList.Data[i + 1]; - try + if(string.IsNullOrWhiteSpace(url)) + url = string.Empty; + else { - Uri dummy = new Uri(url, UriKind.Absolute); - } - catch - { - Error("llParcelMediaCommandList", "invalid PARCEL_MEDIA_COMMAND_URL"); - return; + try + { + Uri dummy = new Uri(url, UriKind.Absolute); + } + catch + { + Error("llParcelMediaCommandList", "invalid PARCEL_MEDIA_COMMAND_URL"); + return; + } } update = true; }