From 3d70dbd01df8c02dc75c66b470602e93665e91f6 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Thu, 5 Mar 2009 20:53:23 +0000 Subject: * refactor: move media and music url setting from scene into LandObject --- OpenSim/Region/Framework/Interfaces/ILandObject.cs | 13 ++++++++++++- OpenSim/Region/Framework/Scenes/Scene.cs | 14 -------------- 2 files changed, 12 insertions(+), 15 deletions(-) (limited to 'OpenSim/Region/Framework') diff --git a/OpenSim/Region/Framework/Interfaces/ILandObject.cs b/OpenSim/Region/Framework/Interfaces/ILandObject.cs index 52cc6cf..db3c9bf 100644 --- a/OpenSim/Region/Framework/Interfaces/ILandObject.cs +++ b/OpenSim/Region/Framework/Interfaces/ILandObject.cs @@ -63,7 +63,6 @@ namespace OpenSim.Region.Framework.Interfaces void forceUpdateLandInfo(); void setLandBitmap(bool[,] bitmap); - bool[,] basicFullRegionLandBitmap(); bool[,] getSquareLandBitmap(int start_x, int start_y, int end_x, int end_y); bool[,] modifyLandBitmapSquare(bool[,] land_bitmap, int start_x, int start_y, int end_x, int end_y, bool set_value); @@ -79,5 +78,17 @@ namespace OpenSim.Region.Framework.Interfaces void setParcelObjectMaxOverride(overrideParcelMaxPrimCountDelegate overrideDel); void setSimulatorObjectMaxOverride(overrideSimulatorMaxPrimCountDelegate overrideDel); + + /// + /// Set the media url for this land parcel + /// + /// + void SetMediaUrl(string url); + + /// + /// Set the music url for this land parcel + /// + /// + void SetMusicUrl(string url); } } diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index faa3bd7..7776215 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -3048,20 +3048,6 @@ namespace OpenSim.Region.Framework.Scenes return LandChannel.GetLandObject((int)x, (int)y).landData; } - public void SetLandMusicURL(float x, float y, string url) - { - ILandObject land = LandChannel.GetLandObject(x, y); - land.landData.MusicURL = url; - land.sendLandUpdateToAvatarsOverMe(); - } - - public void SetLandMediaURL(float x, float y, string url) - { - ILandObject land = LandChannel.GetLandObject(x, y); - land.landData.MediaURL = url; - land.sendLandUpdateToAvatarsOverMe(); - } - public RegionInfo RequestClosestRegion(string name) { return m_sceneGridService.RequestClosestRegion(name); -- cgit v1.1