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/Framework | |
| parent | Typo fix (diff) | |
| parent | refactor: change RezScriptFromAgentInventory(), RezNewScript() and AddInvento... (diff) | |
| download | opensim-SC-4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf.zip opensim-SC-4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf.tar.gz opensim-SC-4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf.tar.bz2 opensim-SC-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 '')
| -rw-r--r-- | OpenSim/Framework/ILandObject.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Framework/ILandObject.cs b/OpenSim/Framework/ILandObject.cs index 0316944..f75a990 100644 --- a/OpenSim/Framework/ILandObject.cs +++ b/OpenSim/Framework/ILandObject.cs | |||
| @@ -130,5 +130,11 @@ namespace OpenSim.Framework | |||
| 130 | /// </summary> | 130 | /// </summary> |
| 131 | /// <param name="url"></param> | 131 | /// <param name="url"></param> |
| 132 | void SetMusicUrl(string url); | 132 | void SetMusicUrl(string url); |
| 133 | |||
| 134 | /// <summary> | ||
| 135 | /// Get the music url for this land parcel | ||
| 136 | /// </summary> | ||
| 137 | /// <returns>The music url.</returns> | ||
| 138 | string GetMusicUrl(); | ||
| 133 | } | 139 | } |
| 134 | } | 140 | } |