diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 01df575..fff39fb 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -330,6 +330,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
330 | item.Flags = (item.Flags & ~(uint)255) | (itemUpd.Flags & (uint)255); | 330 | item.Flags = (item.Flags & ~(uint)255) | (itemUpd.Flags & (uint)255); |
331 | item.Name = itemUpd.Name; | 331 | item.Name = itemUpd.Name; |
332 | item.Description = itemUpd.Description; | 332 | item.Description = itemUpd.Description; |
333 | |||
334 | // m_log.DebugFormat( | ||
335 | // "[USER INVENTORY]: itemUpd {0} {1} {2} {3}, item {4} {5} {6} {7}", | ||
336 | // itemUpd.NextPermissions, itemUpd.GroupPermissions, itemUpd.EveryOnePermissions, item.Flags, | ||
337 | // item.NextPermissions, item.GroupPermissions, item.EveryOnePermissions, item.CurrentPermissions); | ||
338 | |||
333 | if (item.NextPermissions != (itemUpd.NextPermissions & item.BasePermissions)) | 339 | if (item.NextPermissions != (itemUpd.NextPermissions & item.BasePermissions)) |
334 | item.Flags |= (uint)InventoryItemFlags.ObjectOverwriteNextOwner; | 340 | item.Flags |= (uint)InventoryItemFlags.ObjectOverwriteNextOwner; |
335 | item.NextPermissions = itemUpd.NextPermissions & item.BasePermissions; | 341 | item.NextPermissions = itemUpd.NextPermissions & item.BasePermissions; |
@@ -338,6 +344,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
338 | item.EveryOnePermissions = itemUpd.EveryOnePermissions & item.BasePermissions; | 344 | item.EveryOnePermissions = itemUpd.EveryOnePermissions & item.BasePermissions; |
339 | if (item.GroupPermissions != (itemUpd.GroupPermissions & item.BasePermissions)) | 345 | if (item.GroupPermissions != (itemUpd.GroupPermissions & item.BasePermissions)) |
340 | item.Flags |= (uint)InventoryItemFlags.ObjectOverwriteGroup; | 346 | item.Flags |= (uint)InventoryItemFlags.ObjectOverwriteGroup; |
347 | |||
348 | // m_log.DebugFormat("[USER INVENTORY]: item.Flags {0}", item.Flags); | ||
349 | |||
341 | item.GroupPermissions = itemUpd.GroupPermissions & item.BasePermissions; | 350 | item.GroupPermissions = itemUpd.GroupPermissions & item.BasePermissions; |
342 | item.GroupID = itemUpd.GroupID; | 351 | item.GroupID = itemUpd.GroupID; |
343 | item.GroupOwned = itemUpd.GroupOwned; | 352 | item.GroupOwned = itemUpd.GroupOwned; |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs index b56d3fc..f3660a5 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | |||
@@ -269,6 +269,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
269 | 269 | ||
270 | public void ApplyNextOwnerPermissions() | 270 | public void ApplyNextOwnerPermissions() |
271 | { | 271 | { |
272 | // m_log.DebugFormat("[PRIM INVENTORY]: Applying next owner permissions to {0} {1}", Name, UUID); | ||
273 | |||
272 | SceneObjectPart[] parts = m_parts.GetArray(); | 274 | SceneObjectPart[] parts = m_parts.GetArray(); |
273 | for (int i = 0; i < parts.Length; i++) | 275 | for (int i = 0; i < parts.Length; i++) |
274 | parts[i].ApplyNextOwnerPermissions(); | 276 | parts[i].ApplyNextOwnerPermissions(); |