on parcel set music or media url, at least check it can be parsed as a url

This commit is contained in:
UbitUmarov
2020-08-08 13:55:19 +01:00
parent a90b1efc7e
commit 946423aa2a

View File

@@ -1882,7 +1882,21 @@ namespace OpenSim.Region.CoreModules.World.Land
/// <param name="url"></param>
public void SetMediaUrl(string url)
{
LandData.MediaURL = url;
if (String.IsNullOrWhiteSpace(url))
LandData.MediaURL = String.Empty;
else
{
try
{
Uri dummmy = new Uri(url, UriKind.Absolute);
LandData.MediaURL = url;
}
catch (Exception e)
{
m_log.ErrorFormat("[LAND OBJECT]: SetMediaUrl error: {0}", e.Message);
return;
}
}
m_scene.LandChannel.UpdateLandObject(LandData.LocalID, LandData);
SendLandUpdateToAvatarsOverMe();
}
@@ -1893,7 +1907,21 @@ namespace OpenSim.Region.CoreModules.World.Land
/// <param name="url"></param>
public void SetMusicUrl(string url)
{
LandData.MusicURL = url;
if (String.IsNullOrWhiteSpace(url))
LandData.MediaURL = String.Empty;
else
{
try
{
Uri dummmy = new Uri(url, UriKind.Absolute);
LandData.MediaURL = url;
}
catch (Exception e)
{
m_log.ErrorFormat("[LAND OBJECT]: SetMusicUrl error: {0}", e.Message);
return;
}
}
m_scene.LandChannel.UpdateLandObject(LandData.LocalID, LandData);
SendLandUpdateToAvatarsOverMe();
}