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/CoreModules/World/Land | |
parent | * simplify media and music url setting since we never get back a null land ob... (diff) | |
download | opensim-SC-3d70dbd01df8c02dc75c66b470602e93665e91f6.zip opensim-SC-3d70dbd01df8c02dc75c66b470602e93665e91f6.tar.gz opensim-SC-3d70dbd01df8c02dc75c66b470602e93665e91f6.tar.bz2 opensim-SC-3d70dbd01df8c02dc75c66b470602e93665e91f6.tar.xz |
* refactor: move media and music url setting from scene into LandObject
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 67cb845..e3e49ba 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -116,7 +116,6 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
116 | return newLand; | 116 | return newLand; |
117 | } | 117 | } |
118 | 118 | ||
119 | |||
120 | static overrideParcelMaxPrimCountDelegate overrideParcelMaxPrimCount; | 119 | static overrideParcelMaxPrimCountDelegate overrideParcelMaxPrimCount; |
121 | static overrideSimulatorMaxPrimCountDelegate overrideSimulatorMaxPrimCount; | 120 | static overrideSimulatorMaxPrimCountDelegate overrideSimulatorMaxPrimCount; |
122 | 121 | ||
@@ -926,5 +925,25 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
926 | #endregion | 925 | #endregion |
927 | 926 | ||
928 | #endregion | 927 | #endregion |
928 | |||
929 | /// <summary> | ||
930 | /// Set the media url for this land parcel | ||
931 | /// </summary> | ||
932 | /// <param name="url"></param> | ||
933 | public void SetMediaUrl(string url) | ||
934 | { | ||
935 | landData.MediaURL = url; | ||
936 | sendLandUpdateToAvatarsOverMe(); | ||
937 | } | ||
938 | |||
939 | /// <summary> | ||
940 | /// Set the music url for this land parcel | ||
941 | /// </summary> | ||
942 | /// <param name="url"></param> | ||
943 | public void SetMusicUrl(string url) | ||
944 | { | ||
945 | landData.MusicURL = url; | ||
946 | sendLandUpdateToAvatarsOverMe(); | ||
947 | } | ||
929 | } | 948 | } |
930 | } | 949 | } |