update permissions fix
parent
969d1be351
commit
ccb4c1fcd8
|
@ -1,36 +1,36 @@
|
||||||
From 89af01c8784da11719ffdca740cac0cb28a6d791 Mon Sep 17 00:00:00 2001
|
From 25061435d1029ed9633ad9aab0532b1c90c8a036 Mon Sep 17 00:00:00 2001
|
||||||
From: Christopher Latza <latzachristopher@live.de>
|
From: Christopher Latza <latzachristopher@live.de>
|
||||||
Date: Sat, 13 Jun 2020 22:11:52 +0200
|
Date: Sat, 13 Jun 2020 22:15:19 +0200
|
||||||
Subject: [PATCH] try to fix perms
|
Subject: [PATCH] fix permissions
|
||||||
|
|
||||||
---
|
---
|
||||||
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 10 +++++++++-
|
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 10 ++++++++++
|
||||||
1 file changed, 9 insertions(+), 1 deletion(-)
|
1 file changed, 10 insertions(+)
|
||||||
|
|
||||||
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
|
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
|
||||||
index ed35ecb082..ac6da391d3 100644
|
index ed35ecb082..ce1b828682 100644
|
||||||
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
|
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
|
||||||
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
|
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
|
||||||
@@ -2513,7 +2513,11 @@ namespace OpenSim.Region.Framework.Scenes
|
@@ -2514,6 +2514,11 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
private object InnerPermsLock = new object();
|
|
||||||
|
|
||||||
public void AggregateInnerPerms()
|
public void AggregateInnerPerms()
|
||||||
- {
|
{
|
||||||
+ {
|
|
||||||
+ AggregatedInnerOwnerPerms = (uint)PermissionMask.AllAndExport;
|
+ AggregatedInnerOwnerPerms = (uint)PermissionMask.AllAndExport;
|
||||||
+ AggregatedInnerGroupPerms = (uint)PermissionMask.AllAndExport;
|
+ AggregatedInnerGroupPerms = (uint)PermissionMask.AllAndExport;
|
||||||
+ AggregatedInnerEveryonePerms = (uint)PermissionMask.AllAndExport;
|
+ AggregatedInnerEveryonePerms = (uint)PermissionMask.AllAndExport;
|
||||||
|
+ return;
|
||||||
+
|
+
|
||||||
// assuming child prims permissions masks are irrelevant on a linkset
|
// assuming child prims permissions masks are irrelevant on a linkset
|
||||||
// root part is handle at SOG since its masks are the sog masks
|
// root part is handle at SOG since its masks are the sog masks
|
||||||
const uint mask = (uint)PermissionMask.AllEffective;
|
const uint mask = (uint)PermissionMask.AllEffective;
|
||||||
@@ -2538,6 +2542,10 @@ namespace OpenSim.Region.Framework.Scenes
|
@@ -2538,6 +2543,11 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
// same as above but called during group Effective Permission validation
|
// same as above but called during group Effective Permission validation
|
||||||
public void AggregatedInnerPermsForGroup()
|
public void AggregatedInnerPermsForGroup()
|
||||||
{
|
{
|
||||||
+ AggregatedInnerOwnerPerms = (uint)PermissionMask.AllAndExport;
|
+ AggregatedInnerOwnerPerms = (uint)PermissionMask.AllAndExport;
|
||||||
+ AggregatedInnerGroupPerms = (uint)PermissionMask.AllAndExport;
|
+ AggregatedInnerGroupPerms = (uint)PermissionMask.AllAndExport;
|
||||||
+ AggregatedInnerEveryonePerms = (uint)PermissionMask.AllAndExport;
|
+ AggregatedInnerEveryonePerms = (uint)PermissionMask.AllAndExport;
|
||||||
|
+ return;
|
||||||
+
|
+
|
||||||
// assuming child prims permissions masks are irrelevant on a linkset
|
// assuming child prims permissions masks are irrelevant on a linkset
|
||||||
// root part is handle at SOG since its masks are the sog masks
|
// root part is handle at SOG since its masks are the sog masks
|
||||||
|
|
Loading…
Reference in New Issue