diff options
author | Melanie | 2013-03-26 03:40:06 +0000 |
---|---|---|
committer | Melanie | 2013-03-26 03:40:06 +0000 |
commit | 5f4c4df227025c6b6156ce8238b56553dca4b5ae (patch) | |
tree | b090b809346ba8e39db1e08ca24933e64dae8ab9 /OpenSim/Region/ScriptEngine | |
parent | BulletSim: new algorithm for vertical attraction which uses quaternion (diff) | |
download | opensim-SC-5f4c4df227025c6b6156ce8238b56553dca4b5ae.zip opensim-SC-5f4c4df227025c6b6156ce8238b56553dca4b5ae.tar.gz opensim-SC-5f4c4df227025c6b6156ce8238b56553dca4b5ae.tar.bz2 opensim-SC-5f4c4df227025c6b6156ce8238b56553dca4b5ae.tar.xz |
Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index e1f0071..aab41f5 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -67,6 +67,7 @@ using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion; | |||
67 | using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; | 67 | using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; |
68 | using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3; | 68 | using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3; |
69 | using System.Reflection; | 69 | using System.Reflection; |
70 | using PermissionMask = OpenSim.Framework.PermissionMask; | ||
70 | 71 | ||
71 | namespace OpenSim.Region.ScriptEngine.Shared.Api | 72 | namespace OpenSim.Region.ScriptEngine.Shared.Api |
72 | { | 73 | { |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index bf1b45b..415166a 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -62,6 +62,7 @@ using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list; | |||
62 | using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion; | 62 | using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion; |
63 | using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; | 63 | using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; |
64 | using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3; | 64 | using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3; |
65 | using PermissionMask = OpenSim.Framework.PermissionMask; | ||
65 | 66 | ||
66 | namespace OpenSim.Region.ScriptEngine.Shared.Api | 67 | namespace OpenSim.Region.ScriptEngine.Shared.Api |
67 | { | 68 | { |
@@ -1787,8 +1788,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1787 | taskItem.InvType = (int)InventoryType.Notecard; | 1788 | taskItem.InvType = (int)InventoryType.Notecard; |
1788 | taskItem.OwnerID = m_host.OwnerID; | 1789 | taskItem.OwnerID = m_host.OwnerID; |
1789 | taskItem.CreatorID = m_host.OwnerID; | 1790 | taskItem.CreatorID = m_host.OwnerID; |
1790 | taskItem.BasePermissions = (uint)PermissionMask.All; | 1791 | taskItem.BasePermissions = (uint)PermissionMask.All | (uint)PermissionMask.Export; |
1791 | taskItem.CurrentPermissions = (uint)PermissionMask.All; | 1792 | taskItem.CurrentPermissions = (uint)PermissionMask.All | (uint)PermissionMask.Export; |
1792 | taskItem.EveryonePermissions = 0; | 1793 | taskItem.EveryonePermissions = 0; |
1793 | taskItem.NextPermissions = (uint)PermissionMask.All; | 1794 | taskItem.NextPermissions = (uint)PermissionMask.All; |
1794 | taskItem.GroupID = m_host.GroupID; | 1795 | taskItem.GroupID = m_host.GroupID; |