From 990ff4034383042e4233a968fe0fcc98e230ddbd Mon Sep 17 00:00:00 2001 From: Christopher Latza Date: Sat, 13 Jun 2020 22:04:02 +0200 Subject: [PATCH] change patch --- Patch/0001-fix-permissions.patch | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/Patch/0001-fix-permissions.patch b/Patch/0001-fix-permissions.patch index 94d68d0..4330b25 100644 --- a/Patch/0001-fix-permissions.patch +++ b/Patch/0001-fix-permissions.patch @@ -1,34 +1,24 @@ -From c42a74fad3386e1b617fdd93a706709a546b74ab Mon Sep 17 00:00:00 2001 +From 1f6af9f8d49b4736b04c48057d9089003a0091cf Mon Sep 17 00:00:00 2001 From: Christopher Latza -Date: Sat, 13 Jun 2020 21:56:02 +0200 -Subject: [PATCH] fix permissions +Date: Sat, 13 Jun 2020 22:03:15 +0200 +Subject: [PATCH] fix permission --- - OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) + OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | 1 + + 1 file changed, 1 insertion(+) diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs -index 0c603b3244..3a7f754ab4 100644 +index 0c603b3244..50d1cae998 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs -@@ -353,6 +353,8 @@ namespace OpenSim.Region.Framework.Scenes +@@ -353,6 +353,7 @@ namespace OpenSim.Region.Framework.Scenes public void AggregatePerms() { + return; -+ lock(m_PermissionsLock) { // aux -@@ -420,7 +422,7 @@ namespace OpenSim.Region.Framework.Scenes - } - - // recover move -- rootEveryonePerms &= (uint)PermissionMask.Move; -+ rootEveryonePerms &= PermissionMask.Move; - everyone |= rootEveryonePerms; - everyone &= ~(uint)PermissionMask.Modify; - if(noBaseTransfer) -- 2.27.0.windows.1