diff options
author | Melanie Thielker | 2008-11-14 17:24:56 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-14 17:24:56 +0000 |
commit | edee11ff8750d452f012690c556384984795f4be (patch) | |
tree | 21738d6ee71f00dea792585ab25557c64e571dca /OpenSim/Region/ScriptEngine/Shared/Api/Implementation | |
parent | * Switch default permissions back to false (so they are not on) as they were ... (diff) | |
download | opensim-SC_OLD-edee11ff8750d452f012690c556384984795f4be.zip opensim-SC_OLD-edee11ff8750d452f012690c556384984795f4be.tar.gz opensim-SC_OLD-edee11ff8750d452f012690c556384984795f4be.tar.bz2 opensim-SC_OLD-edee11ff8750d452f012690c556384984795f4be.tar.xz |
Reapplying a revised version of Christopher Yeoh's (IBM) patch for allow
inventory drop. Also adds a new flags, "propagate_permissions" to
OpenSim.ini to control that feature.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 |
2 files changed, 4 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 ab7b710..c1d718e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -4006,6 +4006,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4006 | m_host.ParentGroup.RootPart.AllowedDrop = true; | 4006 | m_host.ParentGroup.RootPart.AllowedDrop = true; |
4007 | else | 4007 | else |
4008 | m_host.ParentGroup.RootPart.AllowedDrop = false; | 4008 | m_host.ParentGroup.RootPart.AllowedDrop = false; |
4009 | |||
4010 | // Update the object flags | ||
4011 | m_host.ParentGroup.RootPart.aggregateScriptEvents(); | ||
4009 | } | 4012 | } |
4010 | 4013 | ||
4011 | public LSL_Vector llGetSunDirection() | 4014 | public LSL_Vector llGetSunDirection() |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index f9302e9..8cac070 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -1014,7 +1014,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1014 | taskItem.PermsMask = 0; | 1014 | taskItem.PermsMask = 0; |
1015 | taskItem.AssetID = asset.FullID; | 1015 | taskItem.AssetID = asset.FullID; |
1016 | 1016 | ||
1017 | m_host.AddInventoryItem(taskItem); | 1017 | m_host.AddInventoryItem(taskItem, false); |
1018 | } | 1018 | } |
1019 | } | 1019 | } |
1020 | } | 1020 | } |