diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 6ab0c24d87..6d273be3c0 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -1882,7 +1882,21 @@ namespace OpenSim.Region.CoreModules.World.Land
///
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
///
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();
}