aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs29
1 files changed, 5 insertions, 24 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 1dcc8be..faa3bd7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1114,7 +1114,6 @@ namespace OpenSim.Region.Framework.Scenes
1114 { 1114 {
1115 Heightmap = new TerrainChannel(map); 1115 Heightmap = new TerrainChannel(map);
1116 } 1116 }
1117
1118 } 1117 }
1119 catch (Exception e) 1118 catch (Exception e)
1120 { 1119 {
@@ -3045,40 +3044,22 @@ namespace OpenSim.Region.Framework.Scenes
3045 3044
3046 public LandData GetLandData(uint x, uint y) 3045 public LandData GetLandData(uint x, uint y)
3047 { 3046 {
3048 m_log.DebugFormat("[SCENE] returning land for {0},{1}", x, y); 3047 m_log.DebugFormat("[SCENE]: returning land for {0},{1}", x, y);
3049 return LandChannel.GetLandObject((int)x, (int)y).landData; 3048 return LandChannel.GetLandObject((int)x, (int)y).landData;
3050 } 3049 }
3051 3050
3052 public void SetLandMusicURL(float x, float y, string url) 3051 public void SetLandMusicURL(float x, float y, string url)
3053 { 3052 {
3054 ILandObject land = LandChannel.GetLandObject(x, y); 3053 ILandObject land = LandChannel.GetLandObject(x, y);
3055 if (land == null) 3054 land.landData.MusicURL = url;
3056 { 3055 land.sendLandUpdateToAvatarsOverMe();
3057 return;
3058 }
3059 else
3060 {
3061 land.landData.MusicURL = url;
3062 land.sendLandUpdateToAvatarsOverMe();
3063 return;
3064 }
3065 } 3056 }
3066 3057
3067 public void SetLandMediaURL(float x, float y, string url) 3058 public void SetLandMediaURL(float x, float y, string url)
3068 { 3059 {
3069 ILandObject land = LandChannel.GetLandObject(x, y); 3060 ILandObject land = LandChannel.GetLandObject(x, y);
3070 3061 land.landData.MediaURL = url;
3071 if (land == null) 3062 land.sendLandUpdateToAvatarsOverMe();
3072 {
3073 return;
3074 }
3075
3076 else
3077 {
3078 land.landData.MediaURL = url;
3079 land.sendLandUpdateToAvatarsOverMe();
3080 return;
3081 }
3082 } 3063 }
3083 3064
3084 public RegionInfo RequestClosestRegion(string name) 3065 public RegionInfo RequestClosestRegion(string name)