aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Agent/AssetTransaction
diff options
context:
space:
mode:
authorMelanie2013-03-24 18:56:28 +0100
committerMelanie2013-03-24 18:56:28 +0100
commitc341664c1b8ccf3bd7b81795b900b971a15ff318 (patch)
tree7d88b1b0f028e798f49c729c1626d06f96d2ba35 /OpenSim/Region/CoreModules/Agent/AssetTransaction
parentMerge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff)
downloadopensim-SC_OLD-c341664c1b8ccf3bd7b81795b900b971a15ff318.zip
opensim-SC_OLD-c341664c1b8ccf3bd7b81795b900b971a15ff318.tar.gz
opensim-SC_OLD-c341664c1b8ccf3bd7b81795b900b971a15ff318.tar.bz2
opensim-SC_OLD-c341664c1b8ccf3bd7b81795b900b971a15ff318.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/CoreModules/Agent/AssetTransaction')
-rw-r--r--OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
index e13f479..ffff37d 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
@@ -34,6 +34,7 @@ using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
36using OpenSim.Services.Interfaces; 36using OpenSim.Services.Interfaces;
37using PermissionMask = OpenSim.Framework.PermissionMask;
37 38
38namespace OpenSim.Region.CoreModules.Agent.AssetTransaction 39namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
39{ 40{
@@ -430,8 +431,8 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
430 item.AssetType = type; 431 item.AssetType = type;
431 item.InvType = invType; 432 item.InvType = invType;
432 item.Folder = InventFolder; 433 item.Folder = InventFolder;
433 item.BasePermissions = 0x7fffffff; 434 item.BasePermissions = (uint)(PermissionMask.All | PermissionMask.Export);
434 item.CurrentPermissions = 0x7fffffff; 435 item.CurrentPermissions = item.BasePermissions;
435 item.GroupPermissions=0; 436 item.GroupPermissions=0;
436 item.EveryOnePermissions=0; 437 item.EveryOnePermissions=0;
437 item.NextPermissions = nextPerm; 438 item.NextPermissions = nextPerm;