diff options
| author | Justin Clark-Casey (justincc) | 2011-07-23 01:59:14 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-07-23 01:59:14 +0100 |
| commit | 667b54f5a2a04fa5a2859397868d270eab3913f1 (patch) | |
| tree | bf91543d5c0c4aa6f1a25873be6acb86144675bc /OpenSim/Region/Framework | |
| parent | Fix problem where sculpts were not getting physical proxies (diff) | |
| download | opensim-SC_OLD-667b54f5a2a04fa5a2859397868d270eab3913f1.zip opensim-SC_OLD-667b54f5a2a04fa5a2859397868d270eab3913f1.tar.gz opensim-SC_OLD-667b54f5a2a04fa5a2859397868d270eab3913f1.tar.bz2 opensim-SC_OLD-667b54f5a2a04fa5a2859397868d270eab3913f1.tar.xz | |
Don't load current/next/everyone/base permissions from the library item xml files - always use PermissionMask.All instead (which was the existing default).
Library items always need the same permissions, so it doesn't make sense to load them from the xml files. This just opens the door to permissions mistakes.
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 30421d4..afc1a4f 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -724,7 +724,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 724 | newName = item.Name; | 724 | newName = item.Name; |
| 725 | } | 725 | } |
| 726 | 726 | ||
| 727 | if (remoteClient.AgentId == oldAgentID || (LibraryService != null && LibraryService.LibraryRootFolder != null && oldAgentID == LibraryService.LibraryRootFolder.Owner)) | 727 | if (remoteClient.AgentId == oldAgentID |
| 728 | || (LibraryService != null | ||
| 729 | && LibraryService.LibraryRootFolder != null | ||
| 730 | && oldAgentID == LibraryService.LibraryRootFolder.Owner)) | ||
| 728 | { | 731 | { |
| 729 | CreateNewInventoryItem( | 732 | CreateNewInventoryItem( |
| 730 | remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Flags, callbackID, asset, (sbyte)item.InvType, | 733 | remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Flags, callbackID, asset, (sbyte)item.InvType, |