diff options
author | Justin Clark-Casey (justincc) | 2011-07-23 02:13:11 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-07-23 02:13:11 +0100 |
commit | f0895028e96e39ca179cad8c103042397ad870e5 (patch) | |
tree | 07a381bc2eac55c04e2776b8d92757881a27ccfc /OpenSim/Services/InventoryService | |
parent | Revert "Don't load current/next/everyone/base permissions from the library it... (diff) | |
download | opensim-SC_OLD-f0895028e96e39ca179cad8c103042397ad870e5.zip opensim-SC_OLD-f0895028e96e39ca179cad8c103042397ad870e5.tar.gz opensim-SC_OLD-f0895028e96e39ca179cad8c103042397ad870e5.tar.bz2 opensim-SC_OLD-f0895028e96e39ca179cad8c103042397ad870e5.tar.xz |
Remove manually permissions settings on all current library items so that they use the defaults instead.
Some items had completely wrong permissions - this is easier than correcting them all.
The ability to set permissions in xml is retained since there are use cases for this (e.g. to create no-mod library scripts)
Diffstat (limited to 'OpenSim/Services/InventoryService')
-rw-r--r-- | OpenSim/Services/InventoryService/LibraryService.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Services/InventoryService/LibraryService.cs b/OpenSim/Services/InventoryService/LibraryService.cs index 383f311..2e9d2b1 100644 --- a/OpenSim/Services/InventoryService/LibraryService.cs +++ b/OpenSim/Services/InventoryService/LibraryService.cs | |||
@@ -193,10 +193,10 @@ namespace OpenSim.Services.InventoryService | |||
193 | item.Description = config.GetString("description", item.Name); | 193 | item.Description = config.GetString("description", item.Name); |
194 | item.InvType = config.GetInt("inventoryType", 0); | 194 | item.InvType = config.GetInt("inventoryType", 0); |
195 | item.AssetType = config.GetInt("assetType", item.InvType); | 195 | item.AssetType = config.GetInt("assetType", item.InvType); |
196 | item.CurrentPermissions = (uint)config.GetLong("currentPermissions", 0x7FFFFFFF); | 196 | item.CurrentPermissions = (uint)config.GetLong("currentPermissions", (uint)PermissionMask.All); |
197 | item.NextPermissions = (uint)config.GetLong("nextPermissions", 0x7FFFFFFF); | 197 | item.NextPermissions = (uint)config.GetLong("nextPermissions", (uint)PermissionMask.All); |
198 | item.EveryOnePermissions = (uint)config.GetLong("everyonePermissions", 0x7FFFFFFF); | 198 | item.EveryOnePermissions = (uint)config.GetLong("everyonePermissions", (uint)PermissionMask.All); |
199 | item.BasePermissions = (uint)config.GetLong("basePermissions", 0x7FFFFFFF); | 199 | item.BasePermissions = (uint)config.GetLong("basePermissions", (uint)PermissionMask.All); |
200 | item.Flags = (uint)config.GetInt("flags", 0); | 200 | item.Flags = (uint)config.GetInt("flags", 0); |
201 | 201 | ||
202 | if (libraryFolders.ContainsKey(item.Folder)) | 202 | if (libraryFolders.ContainsKey(item.Folder)) |