diff options
author | Justin Clark-Casey (justincc) | 2011-07-23 02:05:51 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-07-23 02:05:51 +0100 |
commit | fcaa4f601231a6feb7fd5ea40e35fba6220c6235 (patch) | |
tree | 003517e08cd61bccc1263ab992d09c576aa25ab4 /OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs | |
parent | Don't load current/next/everyone/base permissions from the library item xml f... (diff) | |
download | opensim-SC_OLD-fcaa4f601231a6feb7fd5ea40e35fba6220c6235.zip opensim-SC_OLD-fcaa4f601231a6feb7fd5ea40e35fba6220c6235.tar.gz opensim-SC_OLD-fcaa4f601231a6feb7fd5ea40e35fba6220c6235.tar.bz2 opensim-SC_OLD-fcaa4f601231a6feb7fd5ea40e35fba6220c6235.tar.xz |
Revert "Don't load current/next/everyone/base permissions from the library item xml files - always use PermissionMask.All instead (which was the existing default)."
There actually are uses for this. I will correct the perms instead since some entries appear to be wrong.
This reverts commit 667b54f5a2a04fa5a2859397868d270eab3913f1.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs index 2ef4457..d570608 100644 --- a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs | |||
@@ -185,7 +185,6 @@ namespace OpenSim.Region.CoreModules.Framework.Library | |||
185 | archread = new InventoryArchiveReadRequest(m_MockScene, uinfo, "/", iarFileName, false); | 185 | archread = new InventoryArchiveReadRequest(m_MockScene, uinfo, "/", iarFileName, false); |
186 | archread.Execute(); | 186 | archread.Execute(); |
187 | } | 187 | } |
188 | |||
189 | foreach (InventoryNodeBase node in nodes) | 188 | foreach (InventoryNodeBase node in nodes) |
190 | FixPerms(node); | 189 | FixPerms(node); |
191 | } | 190 | } |
@@ -198,23 +197,18 @@ namespace OpenSim.Region.CoreModules.Framework.Library | |||
198 | archread.Close(); | 197 | archread.Close(); |
199 | } | 198 | } |
200 | } | 199 | } |
200 | |||
201 | } | 201 | } |
202 | 202 | ||
203 | private void FixPerms(InventoryNodeBase node) | 203 | private void FixPerms(InventoryNodeBase node) |
204 | { | 204 | { |
205 | m_log.DebugFormat("[LIBRARY MODULE]: Fixing perms for {0} {1}", node.Name, node.ID); | ||
206 | |||
207 | if (node is InventoryItemBase) | 205 | if (node is InventoryItemBase) |
208 | { | 206 | { |
209 | InventoryItemBase item = (InventoryItemBase)node; | 207 | InventoryItemBase item = (InventoryItemBase)node; |
210 | // item.BasePermissions = (uint)PermissionMask.All; | ||
211 | item.BasePermissions = 0x7FFFFFFF; | 208 | item.BasePermissions = 0x7FFFFFFF; |
212 | item.EveryOnePermissions = 0x7FFFFFFF; | 209 | item.EveryOnePermissions = 0x7FFFFFFF; |
213 | item.CurrentPermissions = 0x7FFFFFFF; | 210 | item.CurrentPermissions = 0x7FFFFFFF; |
214 | item.NextPermissions = 0x7FFFFFFF; | 211 | item.NextPermissions = 0x7FFFFFFF; |
215 | // item.EveryOnePermissions = (uint)PermissionMask.Copy; | ||
216 | // item.CurrentPermissions = (uint)PermissionMask.None; | ||
217 | // item.NextPermissions = (uint)PermissionMask.All; | ||
218 | } | 212 | } |
219 | } | 213 | } |
220 | 214 | ||