From 1253f193251d65da24ea081cbe207c9cbd1318ac Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 11 Jan 2017 17:10:29 +0000
Subject: more changes to GenerateClientFlags(), use already cached presence
 group information, let it be aware of groups roles. (not exactly as the other
 grid)

---
 OpenSim/Region/Framework/Scenes/Scene.Permissions.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
index c4cb6c7..e045c43 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
@@ -37,7 +37,7 @@ using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.Framework.Scenes
 {
     #region Delegates
-    public delegate uint GenerateClientFlagsHandler(ScenePresence sp, UUID objectID);
+    public delegate uint GenerateClientFlagsHandler(ScenePresence sp, uint curEffectivePerms, UUID objectID);
     public delegate void SetBypassPermissionsHandler(bool value);
     public delegate bool BypassPermissionsHandler();
     public delegate bool PropagatePermissionsHandler();
@@ -195,7 +195,7 @@ namespace OpenSim.Region.Framework.Scenes
                 Delegate[] list = handlerGenerateClientFlags.GetInvocationList();
                 foreach (GenerateClientFlagsHandler check in list)
                 {
-                    perms &= check(sp, objectID);
+                    perms &= check(sp, perms, objectID);
                 }
             }
             return perms;
-- 
cgit v1.1