diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs | 12 | ||||
-rw-r--r-- | OpenSim/Services/InventoryService/LibraryService.cs | 3 |
2 files changed, 6 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs index 2ef4457..3155ce7 100644 --- a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs | |||
@@ -207,14 +207,10 @@ namespace OpenSim.Region.CoreModules.Framework.Library | |||
207 | if (node is InventoryItemBase) | 207 | if (node is InventoryItemBase) |
208 | { | 208 | { |
209 | InventoryItemBase item = (InventoryItemBase)node; | 209 | InventoryItemBase item = (InventoryItemBase)node; |
210 | // item.BasePermissions = (uint)PermissionMask.All; | 210 | item.BasePermissions = (uint)PermissionMask.All; |
211 | item.BasePermissions = 0x7FFFFFFF; | 211 | item.EveryOnePermissions = (uint)PermissionMask.All - (uint)PermissionMask.Modify; |
212 | item.EveryOnePermissions = 0x7FFFFFFF; | 212 | item.CurrentPermissions = (uint)PermissionMask.All; |
213 | item.CurrentPermissions = 0x7FFFFFFF; | 213 | item.NextPermissions = (uint)PermissionMask.All; |
214 | item.NextPermissions = 0x7FFFFFFF; | ||
215 | // item.EveryOnePermissions = (uint)PermissionMask.Copy; | ||
216 | // item.CurrentPermissions = (uint)PermissionMask.None; | ||
217 | // item.NextPermissions = (uint)PermissionMask.All; | ||
218 | } | 214 | } |
219 | } | 215 | } |
220 | 216 | ||
diff --git a/OpenSim/Services/InventoryService/LibraryService.cs b/OpenSim/Services/InventoryService/LibraryService.cs index 2e9d2b1..f90895b 100644 --- a/OpenSim/Services/InventoryService/LibraryService.cs +++ b/OpenSim/Services/InventoryService/LibraryService.cs | |||
@@ -195,7 +195,8 @@ namespace OpenSim.Services.InventoryService | |||
195 | item.AssetType = config.GetInt("assetType", item.InvType); | 195 | item.AssetType = config.GetInt("assetType", item.InvType); |
196 | item.CurrentPermissions = (uint)config.GetLong("currentPermissions", (uint)PermissionMask.All); | 196 | item.CurrentPermissions = (uint)config.GetLong("currentPermissions", (uint)PermissionMask.All); |
197 | item.NextPermissions = (uint)config.GetLong("nextPermissions", (uint)PermissionMask.All); | 197 | item.NextPermissions = (uint)config.GetLong("nextPermissions", (uint)PermissionMask.All); |
198 | item.EveryOnePermissions = (uint)config.GetLong("everyonePermissions", (uint)PermissionMask.All); | 198 | item.EveryOnePermissions |
199 | = (uint)config.GetLong("everyonePermissions", (uint)PermissionMask.All - (uint)PermissionMask.Modify); | ||
199 | item.BasePermissions = (uint)config.GetLong("basePermissions", (uint)PermissionMask.All); | 200 | item.BasePermissions = (uint)config.GetLong("basePermissions", (uint)PermissionMask.All); |
200 | item.Flags = (uint)config.GetInt("flags", 0); | 201 | item.Flags = (uint)config.GetInt("flags", 0); |
201 | 202 | ||