diff options
author | Melanie | 2013-03-26 03:26:28 +0000 |
---|---|---|
committer | Melanie | 2013-03-26 03:26:28 +0000 |
commit | 36c57bac8e86b5c64c5ef89a0dc24e55662ad34c (patch) | |
tree | db7079f27f7209f5eacdd27e9a25903d56030032 /OpenSim/Region/ScriptEngine | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask (diff) | |
download | opensim-SC-36c57bac8e86b5c64c5ef89a0dc24e55662ad34c.zip opensim-SC-36c57bac8e86b5c64c5ef89a0dc24e55662ad34c.tar.gz opensim-SC-36c57bac8e86b5c64c5ef89a0dc24e55662ad34c.tar.bz2 opensim-SC-36c57bac8e86b5c64c5ef89a0dc24e55662ad34c.tar.xz |
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
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 1fbfc52..f677cdf 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -71,6 +71,7 @@ using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; | |||
71 | using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3; | 71 | using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3; |
72 | using System.Reflection; | 72 | using System.Reflection; |
73 | using Timer = System.Timers.Timer; | 73 | using Timer = System.Timers.Timer; |
74 | using PermissionMask = OpenSim.Framework.PermissionMask; | ||
74 | 75 | ||
75 | namespace OpenSim.Region.ScriptEngine.Shared.Api | 76 | namespace OpenSim.Region.ScriptEngine.Shared.Api |
76 | { | 77 | { |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 234ba34..f4e4f44 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 | { |
@@ -1796,8 +1797,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1796 | taskItem.InvType = (int)InventoryType.Notecard; | 1797 | taskItem.InvType = (int)InventoryType.Notecard; |
1797 | taskItem.OwnerID = m_host.OwnerID; | 1798 | taskItem.OwnerID = m_host.OwnerID; |
1798 | taskItem.CreatorID = m_host.OwnerID; | 1799 | taskItem.CreatorID = m_host.OwnerID; |
1799 | taskItem.BasePermissions = (uint)PermissionMask.All; | 1800 | taskItem.BasePermissions = (uint)PermissionMask.All | (uint)PermissionMask.Export; |
1800 | taskItem.CurrentPermissions = (uint)PermissionMask.All; | 1801 | taskItem.CurrentPermissions = (uint)PermissionMask.All | (uint)PermissionMask.Export; |
1801 | taskItem.EveryonePermissions = 0; | 1802 | taskItem.EveryonePermissions = 0; |
1802 | taskItem.NextPermissions = (uint)PermissionMask.All; | 1803 | taskItem.NextPermissions = (uint)PermissionMask.All; |
1803 | taskItem.GroupID = m_host.GroupID; | 1804 | taskItem.GroupID = m_host.GroupID; |