ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 19:36:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

* simplify media and music url setting since we never get back a null land object

Browse Source
This commit is contained in:
Justin Clarke Casey
2009-03-05 20:32:35 +00:00
parent 6c735e0828
commit c213a12b57
3 changed files with 22 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -1114,7 +1114,6 @@ namespace OpenSim.Region.Framework.Scenes
{
Heightmap = new TerrainChannel(map);
}
}
catch (Exception e)
{
@@ -3045,40 +3044,22 @@ namespace OpenSim.Region.Framework.Scenes
public LandData GetLandData(uint x, uint y)
{
m_log.DebugFormat("[SCENE] returning land for {0},{1}", x, y);
m_log.DebugFormat("[SCENE]: returning land for {0},{1}", x, y);
return LandChannel.GetLandObject((int)x, (int)y).landData;
}
public void SetLandMusicURL(float x, float y, string url)
{
ILandObject land = LandChannel.GetLandObject(x, y);
if (land == null)
{
return;
}
else
{
land.landData.MusicURL = url;
land.sendLandUpdateToAvatarsOverMe();
return;
}
land.landData.MusicURL = url;
land.sendLandUpdateToAvatarsOverMe();
}
public void SetLandMediaURL(float x, float y, string url)
{
ILandObject land = LandChannel.GetLandObject(x, y);
if (land == null)
{
return;
}
else
{
land.landData.MediaURL = url;
land.sendLandUpdateToAvatarsOverMe();
return;
}
land.landData.MediaURL = url;
land.sendLandUpdateToAvatarsOverMe();
}
public RegionInfo RequestClosestRegion(string name)