diff options
author | Justin Clarke Casey | 2009-03-05 20:53:23 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-03-05 20:53:23 +0000 |
commit | 3d70dbd01df8c02dc75c66b470602e93665e91f6 (patch) | |
tree | 431b5bde21d9945f2732cae0f477f417a3028b2a /OpenSim/Region/Framework | |
parent | * simplify media and music url setting since we never get back a null land ob... (diff) | |
download | opensim-SC_OLD-3d70dbd01df8c02dc75c66b470602e93665e91f6.zip opensim-SC_OLD-3d70dbd01df8c02dc75c66b470602e93665e91f6.tar.gz opensim-SC_OLD-3d70dbd01df8c02dc75c66b470602e93665e91f6.tar.bz2 opensim-SC_OLD-3d70dbd01df8c02dc75c66b470602e93665e91f6.tar.xz |
* refactor: move media and music url setting from scene into LandObject
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/ILandObject.cs | 13 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 14 |
2 files changed, 12 insertions, 15 deletions
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 | |||
63 | void forceUpdateLandInfo(); | 63 | void forceUpdateLandInfo(); |
64 | void setLandBitmap(bool[,] bitmap); | 64 | void setLandBitmap(bool[,] bitmap); |
65 | 65 | ||
66 | |||
67 | bool[,] basicFullRegionLandBitmap(); | 66 | bool[,] basicFullRegionLandBitmap(); |
68 | bool[,] getSquareLandBitmap(int start_x, int start_y, int end_x, int end_y); | 67 | bool[,] getSquareLandBitmap(int start_x, int start_y, int end_x, int end_y); |
69 | bool[,] modifyLandBitmapSquare(bool[,] land_bitmap, int start_x, int start_y, int end_x, int end_y, bool set_value); | 68 | 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 | |||
79 | 78 | ||
80 | void setParcelObjectMaxOverride(overrideParcelMaxPrimCountDelegate overrideDel); | 79 | void setParcelObjectMaxOverride(overrideParcelMaxPrimCountDelegate overrideDel); |
81 | void setSimulatorObjectMaxOverride(overrideSimulatorMaxPrimCountDelegate overrideDel); | 80 | void setSimulatorObjectMaxOverride(overrideSimulatorMaxPrimCountDelegate overrideDel); |
81 | |||
82 | /// <summary> | ||
83 | /// Set the media url for this land parcel | ||
84 | /// </summary> | ||
85 | /// <param name="url"></param> | ||
86 | void SetMediaUrl(string url); | ||
87 | |||
88 | /// <summary> | ||
89 | /// Set the music url for this land parcel | ||
90 | /// </summary> | ||
91 | /// <param name="url"></param> | ||
92 | void SetMusicUrl(string url); | ||
82 | } | 93 | } |
83 | } | 94 | } |
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 | |||
3048 | return LandChannel.GetLandObject((int)x, (int)y).landData; | 3048 | return LandChannel.GetLandObject((int)x, (int)y).landData; |
3049 | } | 3049 | } |
3050 | 3050 | ||
3051 | public void SetLandMusicURL(float x, float y, string url) | ||
3052 | { | ||
3053 | ILandObject land = LandChannel.GetLandObject(x, y); | ||
3054 | land.landData.MusicURL = url; | ||
3055 | land.sendLandUpdateToAvatarsOverMe(); | ||
3056 | } | ||
3057 | |||
3058 | public void SetLandMediaURL(float x, float y, string url) | ||
3059 | { | ||
3060 | ILandObject land = LandChannel.GetLandObject(x, y); | ||
3061 | land.landData.MediaURL = url; | ||
3062 | land.sendLandUpdateToAvatarsOverMe(); | ||
3063 | } | ||
3064 | |||
3065 | public RegionInfo RequestClosestRegion(string name) | 3051 | public RegionInfo RequestClosestRegion(string name) |
3066 | { | 3052 | { |
3067 | return m_sceneGridService.RequestClosestRegion(name); | 3053 | return m_sceneGridService.RequestClosestRegion(name); |