OpenSim
/
4Creative-Changes
1
0
Fork 0
Code Releases Activity

try an other way

master
Christopher Latza 2020-06-13 22:12:39 +02:00
parent 990ff40343
commit 969d1be351
1 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Patch/0001-fix-permissions.patch
View File

@ -1,24 +1,40 @@
From 1f6af9f8d49b4736b04c48057d9089003a0091cf Mon Sep 17 00:00:00 2001
From 89af01c8784da11719ffdca740cac0cb28a6d791 Mon Sep 17 00:00:00 2001
From: Christopher Latza <latzachristopher@live.de>
Date: Sat, 13 Jun 2020 22:03:15 +0200
Subject: [PATCH] fix permission
Date: Sat, 13 Jun 2020 22:11:52 +0200
Subject: [PATCH] try to fix perms
---
OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | 1 +
1 file changed, 1 insertion(+)
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index 0c603b3244..50d1cae998 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -353,6 +353,7 @@ namespace OpenSim.Region.Framework.Scenes
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index ed35ecb082..ac6da391d3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2513,7 +2513,11 @@ namespace OpenSim.Region.Framework.Scenes
private object InnerPermsLock = new object();
public void AggregatePerms()
public void AggregateInnerPerms()
- {
+ {
+ AggregatedInnerOwnerPerms = (uint)PermissionMask.AllAndExport;
+ AggregatedInnerGroupPerms = (uint)PermissionMask.AllAndExport;
+ AggregatedInnerEveryonePerms = (uint)PermissionMask.AllAndExport;
+
// assuming child prims permissions masks are irrelevant on a linkset
// root part is handle at SOG since its masks are the sog masks
const uint mask = (uint)PermissionMask.AllEffective;
@@ -2538,6 +2542,10 @@ namespace OpenSim.Region.Framework.Scenes
// same as above but called during group Effective Permission validation
public void AggregatedInnerPermsForGroup()
{
+ return;
lock(m_PermissionsLock)
{
// aux
+ AggregatedInnerOwnerPerms = (uint)PermissionMask.AllAndExport;
+ AggregatedInnerGroupPerms = (uint)PermissionMask.AllAndExport;
+ AggregatedInnerEveryonePerms = (uint)PermissionMask.AllAndExport;
+
// assuming child prims permissions masks are irrelevant on a linkset
// root part is handle at SOG since its masks are the sog masks
const uint mask = (uint)PermissionMask.AllEffective;
--
2.27.0.windows.1