diff options
author | Melanie Thielker | 2016-04-29 22:36:56 +0200 |
---|---|---|
committer | Melanie Thielker | 2016-04-29 22:36:56 +0200 |
commit | 59ed89769aa292196f99affe0a99a758e63a538a (patch) | |
tree | 2c09cf5c14e2dc51b0e95cdd95ffd29d01abcbe0 /OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |
parent | Allow default permissions from the viewer to be applied to uploaded objects. (diff) | |
download | opensim-SC_OLD-59ed89769aa292196f99affe0a99a758e63a538a.zip opensim-SC_OLD-59ed89769aa292196f99affe0a99a758e63a538a.tar.gz opensim-SC_OLD-59ed89769aa292196f99affe0a99a758e63a538a.tar.bz2 opensim-SC_OLD-59ed89769aa292196f99affe0a99a758e63a538a.tar.xz |
Apply user specified default perms across the board, to items uploaded as well as items created and to rezzed prims in world.
This effectively removes the concept of "default permissions" from OpenSim
because all known modern viewers set the permissions flags on login.
Ancient abandoned viewers will now default to the SL defaults.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index 49a708b..d4a929c 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
@@ -175,8 +175,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
175 | /// <param name="nextOwnerMask"></param> | 175 | /// <param name="nextOwnerMask"></param> |
176 | public void CreateNewInventoryItem(IClientAPI remoteClient, UUID transactionID, UUID folderID, | 176 | public void CreateNewInventoryItem(IClientAPI remoteClient, UUID transactionID, UUID folderID, |
177 | uint callbackID, string description, string name, sbyte invType, | 177 | uint callbackID, string description, string name, sbyte invType, |
178 | sbyte assetType, | 178 | sbyte assetType, byte wearableType, |
179 | byte wearableType, uint nextOwnerMask, int creationDate) | 179 | uint nextOwnerMask, int creationDate) |
180 | { | 180 | { |
181 | m_log.DebugFormat("[INVENTORY ACCESS MODULE]: Received request to create inventory item {0} in folder {1}, transactionID {2}", name, | 181 | m_log.DebugFormat("[INVENTORY ACCESS MODULE]: Received request to create inventory item {0} in folder {1}, transactionID {2}", name, |
182 | folderID, transactionID); | 182 | folderID, transactionID); |
@@ -220,7 +220,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
220 | m_Scene.AssetService.Store(asset); | 220 | m_Scene.AssetService.Store(asset); |
221 | m_Scene.CreateNewInventoryItem( | 221 | m_Scene.CreateNewInventoryItem( |
222 | remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID, | 222 | remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID, |
223 | name, description, 0, callbackID, asset.FullID, asset.Type, invType, nextOwnerMask, creationDate); | 223 | name, description, 0, callbackID, asset.FullID, asset.Type, invType, |
224 | (uint)PermissionMask.All | (uint)PermissionMask.Export, // Base | ||
225 | (uint)PermissionMask.All | (uint)PermissionMask.Export, // Current | ||
226 | 0, nextOwnerMask, 0, creationDate, false); // Data from viewer | ||
224 | } | 227 | } |
225 | else | 228 | else |
226 | { | 229 | { |