diff options
| author | Justin Clark-Casey (justincc) | 2012-01-25 21:26:34 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-01-25 21:26:34 +0000 |
| commit | 2e7c1bcfd9b256c6041776f3a7aac1b62edc867b (patch) | |
| tree | db09574e83ed6ae2cebc43150570da32d5c646a3 /OpenSim/Region/CoreModules/World/Land/LandObject.cs | |
| parent | minor: stop the WebStatsModule logging UPDATE or INSERT every time it updates... (diff) | |
| parent | llGetParcelMusicURL implementation http://wiki.secondlife.com/wiki/LlGetParce... (diff) | |
| download | opensim-SC_OLD-2e7c1bcfd9b256c6041776f3a7aac1b62edc867b.zip opensim-SC_OLD-2e7c1bcfd9b256c6041776f3a7aac1b62edc867b.tar.gz opensim-SC_OLD-2e7c1bcfd9b256c6041776f3a7aac1b62edc867b.tar.bz2 opensim-SC_OLD-2e7c1bcfd9b256c6041776f3a7aac1b62edc867b.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land/LandObject.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 0da0de3..79b13c3 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
| @@ -1094,7 +1094,16 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
| 1094 | LandData.MusicURL = url; | 1094 | LandData.MusicURL = url; |
| 1095 | SendLandUpdateToAvatarsOverMe(); | 1095 | SendLandUpdateToAvatarsOverMe(); |
| 1096 | } | 1096 | } |
| 1097 | 1097 | ||
| 1098 | /// <summary> | ||
| 1099 | /// Get the music url for this land parcel | ||
| 1100 | /// </summary> | ||
| 1101 | /// <returns>The music url.</returns> | ||
| 1102 | public string GetMusicUrl() | ||
| 1103 | { | ||
| 1104 | return LandData.MusicURL; | ||
| 1105 | } | ||
| 1106 | |||
| 1098 | #endregion | 1107 | #endregion |
| 1099 | } | 1108 | } |
| 1100 | } | 1109 | } |