diff options
author | Melanie | 2012-01-26 00:21:21 +0000 |
---|---|---|
committer | Melanie | 2012-01-26 00:21:21 +0000 |
commit | 4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf (patch) | |
tree | 6173c8da92084547e89db40e5762a74249b4a8db /OpenSim/Region/CoreModules/World/Land/LandObject.cs | |
parent | Typo fix (diff) | |
parent | refactor: change RezScriptFromAgentInventory(), RezNewScript() and AddInvento... (diff) | |
download | opensim-SC_OLD-4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf.zip opensim-SC_OLD-4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf.tar.gz opensim-SC_OLD-4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf.tar.bz2 opensim-SC_OLD-4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
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 48f58f0..2d54ed1 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -1153,7 +1153,16 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1153 | LandData.MusicURL = url; | 1153 | LandData.MusicURL = url; |
1154 | SendLandUpdateToAvatarsOverMe(); | 1154 | SendLandUpdateToAvatarsOverMe(); |
1155 | } | 1155 | } |
1156 | 1156 | ||
1157 | /// <summary> | ||
1158 | /// Get the music url for this land parcel | ||
1159 | /// </summary> | ||
1160 | /// <returns>The music url.</returns> | ||
1161 | public string GetMusicUrl() | ||
1162 | { | ||
1163 | return LandData.MusicURL; | ||
1164 | } | ||
1165 | |||
1157 | #endregion | 1166 | #endregion |
1158 | } | 1167 | } |
1159 | } | 1168 | } |