2020-06-13 20:16:23 +00:00
|
|
|
From 25061435d1029ed9633ad9aab0532b1c90c8a036 Mon Sep 17 00:00:00 2001
|
2020-06-13 19:56:48 +00:00
|
|
|
From: Christopher Latza <latzachristopher@live.de>
|
2020-06-13 20:16:23 +00:00
|
|
|
Date: Sat, 13 Jun 2020 22:15:19 +0200
|
|
|
|
Subject: [PATCH] fix permissions
|
2020-06-13 19:56:48 +00:00
|
|
|
|
|
|
|
---
|
2020-06-13 20:16:23 +00:00
|
|
|
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 10 ++++++++++
|
|
|
|
1 file changed, 10 insertions(+)
|
2020-06-13 19:56:48 +00:00
|
|
|
|
2020-06-13 20:12:39 +00:00
|
|
|
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
|
2020-06-13 20:16:23 +00:00
|
|
|
index ed35ecb082..ce1b828682 100644
|
2020-06-13 20:12:39 +00:00
|
|
|
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
|
|
|
|
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
|
2020-06-13 20:16:23 +00:00
|
|
|
@@ -2514,6 +2514,11 @@ namespace OpenSim.Region.Framework.Scenes
|
2020-06-13 19:56:48 +00:00
|
|
|
|
2020-06-13 20:12:39 +00:00
|
|
|
public void AggregateInnerPerms()
|
2020-06-13 20:16:23 +00:00
|
|
|
{
|
2020-06-13 20:12:39 +00:00
|
|
|
+ AggregatedInnerOwnerPerms = (uint)PermissionMask.AllAndExport;
|
|
|
|
+ AggregatedInnerGroupPerms = (uint)PermissionMask.AllAndExport;
|
|
|
|
+ AggregatedInnerEveryonePerms = (uint)PermissionMask.AllAndExport;
|
2020-06-13 20:16:23 +00:00
|
|
|
+ return;
|
2020-06-13 20:12:39 +00:00
|
|
|
+
|
|
|
|
// 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;
|
2020-06-13 20:16:23 +00:00
|
|
|
@@ -2538,6 +2543,11 @@ namespace OpenSim.Region.Framework.Scenes
|
2020-06-13 20:12:39 +00:00
|
|
|
// same as above but called during group Effective Permission validation
|
|
|
|
public void AggregatedInnerPermsForGroup()
|
2020-06-13 19:56:48 +00:00
|
|
|
{
|
2020-06-13 20:12:39 +00:00
|
|
|
+ AggregatedInnerOwnerPerms = (uint)PermissionMask.AllAndExport;
|
|
|
|
+ AggregatedInnerGroupPerms = (uint)PermissionMask.AllAndExport;
|
|
|
|
+ AggregatedInnerEveryonePerms = (uint)PermissionMask.AllAndExport;
|
2020-06-13 20:16:23 +00:00
|
|
|
+ return;
|
2020-06-13 20:12:39 +00:00
|
|
|
+
|
|
|
|
// 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;
|
2020-06-13 19:56:48 +00:00
|
|
|
--
|
|
|
|
2.27.0.windows.1
|
|
|
|
|