aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Agent
diff options
context:
space:
mode:
authorMelanie2013-03-26 03:40:06 +0000
committerMelanie2013-03-26 03:40:06 +0000
commit5f4c4df227025c6b6156ce8238b56553dca4b5ae (patch)
treeb090b809346ba8e39db1e08ca24933e64dae8ab9 /OpenSim/Region/CoreModules/Agent
parentBulletSim: new algorithm for vertical attraction which uses quaternion (diff)
downloadopensim-SC_OLD-5f4c4df227025c6b6156ce8238b56553dca4b5ae.zip
opensim-SC_OLD-5f4c4df227025c6b6156ce8238b56553dca4b5ae.tar.gz
opensim-SC_OLD-5f4c4df227025c6b6156ce8238b56553dca4b5ae.tar.bz2
opensim-SC_OLD-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/CoreModules/Agent')
-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 11efe6d..5e772e6 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
@@ -33,6 +33,7 @@ using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Framework.Scenes; 34using OpenSim.Region.Framework.Scenes;
35using OpenSim.Services.Interfaces; 35using OpenSim.Services.Interfaces;
36using PermissionMask = OpenSim.Framework.PermissionMask;
36 37
37namespace OpenSim.Region.CoreModules.Agent.AssetTransaction 38namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
38{ 39{
@@ -406,8 +407,8 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
406 item.AssetType = type; 407 item.AssetType = type;
407 item.InvType = invType; 408 item.InvType = invType;
408 item.Folder = InventFolder; 409 item.Folder = InventFolder;
409 item.BasePermissions = 0x7fffffff; 410 item.BasePermissions = (uint)(PermissionMask.All | PermissionMask.Export);
410 item.CurrentPermissions = 0x7fffffff; 411 item.CurrentPermissions = item.BasePermissions;
411 item.GroupPermissions=0; 412 item.GroupPermissions=0;
412 item.EveryOnePermissions=0; 413 item.EveryOnePermissions=0;
413 item.NextPermissions = nextPerm; 414 item.NextPermissions = nextPerm;