diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
3 files changed, 19 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index fda4772..23e3e15 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -7003,7 +7003,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7003 | if ((scriptItem.BasePermissions & (uint)PermissionMask.Transfer) != 0 || dest.ParentGroup.RootPart.OwnerID == m_host.ParentGroup.RootPart.OwnerID) | 7003 | if ((scriptItem.BasePermissions & (uint)PermissionMask.Transfer) != 0 || dest.ParentGroup.RootPart.OwnerID == m_host.ParentGroup.RootPart.OwnerID) |
7004 | { | 7004 | { |
7005 | // the rest of the permission checks are done in RezScript, so check the pin there as well | 7005 | // the rest of the permission checks are done in RezScript, so check the pin there as well |
7006 | World.RezScript(srcId, m_host, destId, pin, running, start_param); | 7006 | World.RezScriptFromPrim(srcId, m_host, destId, pin, running, start_param); |
7007 | 7007 | ||
7008 | if ((scriptItem.BasePermissions & (uint)PermissionMask.Copy) == 0) | 7008 | if ((scriptItem.BasePermissions & (uint)PermissionMask.Copy) == 0) |
7009 | m_host.Inventory.RemoveInventoryItem(srcId); | 7009 | m_host.Inventory.RemoveInventoryItem(srcId); |
@@ -8065,6 +8065,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
8065 | ScriptSleep(2000); | 8065 | ScriptSleep(2000); |
8066 | } | 8066 | } |
8067 | 8067 | ||
8068 | public LSL_String llGetParcelMusicURL() | ||
8069 | { | ||
8070 | m_host.AddScriptLPS(1); | ||
8071 | |||
8072 | ILandObject land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); | ||
8073 | |||
8074 | if (land.LandData.OwnerID != m_host.OwnerID) | ||
8075 | return String.Empty; | ||
8076 | |||
8077 | return land.GetMusicUrl(); | ||
8078 | } | ||
8079 | |||
8068 | public LSL_Vector llGetRootPosition() | 8080 | public LSL_Vector llGetRootPosition() |
8069 | { | 8081 | { |
8070 | m_host.AddScriptLPS(1); | 8082 | m_host.AddScriptLPS(1); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs index e0027b2..f4de93e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | |||
@@ -162,6 +162,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
162 | LSL_List llGetParcelDetails(LSL_Vector pos, LSL_List param); | 162 | LSL_List llGetParcelDetails(LSL_Vector pos, LSL_List param); |
163 | LSL_Integer llGetParcelFlags(LSL_Vector pos); | 163 | LSL_Integer llGetParcelFlags(LSL_Vector pos); |
164 | LSL_Integer llGetParcelMaxPrims(LSL_Vector pos, int sim_wide); | 164 | LSL_Integer llGetParcelMaxPrims(LSL_Vector pos, int sim_wide); |
165 | LSL_String llGetParcelMusicURL(); | ||
165 | LSL_Integer llGetParcelPrimCount(LSL_Vector pos, int category, int sim_wide); | 166 | LSL_Integer llGetParcelPrimCount(LSL_Vector pos, int category, int sim_wide); |
166 | LSL_List llGetParcelPrimOwners(LSL_Vector pos); | 167 | LSL_List llGetParcelPrimOwners(LSL_Vector pos); |
167 | LSL_Integer llGetPermissions(); | 168 | LSL_Integer llGetPermissions(); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs index 231cd7e..e0c81c7 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | |||
@@ -661,6 +661,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
661 | return m_LSL_Functions.llGetParcelMaxPrims(pos, sim_wide); | 661 | return m_LSL_Functions.llGetParcelMaxPrims(pos, sim_wide); |
662 | } | 662 | } |
663 | 663 | ||
664 | public LSL_String llGetParcelMusicURL() | ||
665 | { | ||
666 | return m_LSL_Functions.llGetParcelMusicURL(); | ||
667 | } | ||
668 | |||
664 | public LSL_Integer llGetParcelPrimCount(LSL_Vector pos, int category, int sim_wide) | 669 | public LSL_Integer llGetParcelPrimCount(LSL_Vector pos, int category, int sim_wide) |
665 | { | 670 | { |
666 | return m_LSL_Functions.llGetParcelPrimCount(pos, category, sim_wide); | 671 | return m_LSL_Functions.llGetParcelPrimCount(pos, category, sim_wide); |