aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
diff options
context:
space:
mode:
authorUbitUmarov2017-01-11 17:10:29 +0000
committerUbitUmarov2017-01-11 17:10:29 +0000
commit1253f193251d65da24ea081cbe207c9cbd1318ac (patch)
tree88f1bf66615e1a25c562a22e6290c605b4863b0c /OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
parentchange GenerateClientFlags(...) to work with a scenepresence; make use of the... (diff)
downloadopensim-SC-1253f193251d65da24ea081cbe207c9cbd1318ac.zip
opensim-SC-1253f193251d65da24ea081cbe207c9cbd1318ac.tar.gz
opensim-SC-1253f193251d65da24ea081cbe207c9cbd1318ac.tar.bz2
opensim-SC-1253f193251d65da24ea081cbe207c9cbd1318ac.tar.xz
more changes to GenerateClientFlags(), use already cached presence group information, let it be aware of groups roles. (not exactly as the other grid)
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Permissions.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Permissions.cs4
1 files changed, 2 insertions, 2 deletions
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;
37namespace OpenSim.Region.Framework.Scenes 37namespace OpenSim.Region.Framework.Scenes
38{ 38{
39 #region Delegates 39 #region Delegates
40 public delegate uint GenerateClientFlagsHandler(ScenePresence sp, UUID objectID); 40 public delegate uint GenerateClientFlagsHandler(ScenePresence sp, uint curEffectivePerms, UUID objectID);
41 public delegate void SetBypassPermissionsHandler(bool value); 41 public delegate void SetBypassPermissionsHandler(bool value);
42 public delegate bool BypassPermissionsHandler(); 42 public delegate bool BypassPermissionsHandler();
43 public delegate bool PropagatePermissionsHandler(); 43 public delegate bool PropagatePermissionsHandler();
@@ -195,7 +195,7 @@ namespace OpenSim.Region.Framework.Scenes
195 Delegate[] list = handlerGenerateClientFlags.GetInvocationList(); 195 Delegate[] list = handlerGenerateClientFlags.GetInvocationList();
196 foreach (GenerateClientFlagsHandler check in list) 196 foreach (GenerateClientFlagsHandler check in list)
197 { 197 {
198 perms &= check(sp, objectID); 198 perms &= check(sp, perms, objectID);
199 } 199 }
200 } 200 }
201 return perms; 201 return perms;