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/ScriptEngine/Shared/Api/Implementation/LSL_Api.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/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index fb930e0..330c65d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -7566,6 +7566,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 7566 | ScriptSleep(2000); | 7566 | ScriptSleep(2000); |
| 7567 | } | 7567 | } |
| 7568 | 7568 | ||
| 7569 | public LSL_String llGetParcelMusicURL() | ||
| 7570 | { | ||
| 7571 | m_host.AddScriptLPS(1); | ||
| 7572 | |||
| 7573 | ILandObject land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); | ||
| 7574 | |||
| 7575 | if (land.LandData.OwnerID != m_host.OwnerID) | ||
| 7576 | return String.Empty; | ||
| 7577 | |||
| 7578 | return land.GetMusicUrl(); | ||
| 7579 | } | ||
| 7580 | |||
| 7569 | public LSL_Vector llGetRootPosition() | 7581 | public LSL_Vector llGetRootPosition() |
| 7570 | { | 7582 | { |
| 7571 | m_host.AddScriptLPS(1); | 7583 | m_host.AddScriptLPS(1); |