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/Region/Framework/Scenes | |
| 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/Region/Framework/Scenes')
| -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, |