diff options
author | UbitUmarov | 2017-01-11 01:02:57 +0000 |
---|---|---|
committer | UbitUmarov | 2017-01-11 01:02:57 +0000 |
commit | e0ab0b3b6b8ae45ff74c274d5af89ccc9bdb5566 (patch) | |
tree | 32da77273f13f5e1511b2b31344f18585deecff0 /OpenSim/Region/Framework | |
parent | remove obsolete PrimFlags.ObjectYouOfficer; rearrange GenerateClientFlags(...... (diff) | |
download | opensim-SC_OLD-e0ab0b3b6b8ae45ff74c274d5af89ccc9bdb5566.zip opensim-SC_OLD-e0ab0b3b6b8ae45ff74c274d5af89ccc9bdb5566.tar.gz opensim-SC_OLD-e0ab0b3b6b8ae45ff74c274d5af89ccc9bdb5566.tar.bz2 opensim-SC_OLD-e0ab0b3b6b8ae45ff74c274d5af89ccc9bdb5566.tar.xz |
change GenerateClientFlags(...) to work with a scenepresence; make use of the new IsGod to check its God rights; remove the non standard estate manager right to move other ppl prims i added on last commits; coment out a test method i added sometime ago
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Permissions.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs index e97e494..c4cb6c7 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; | |||
37 | namespace OpenSim.Region.Framework.Scenes | 37 | namespace OpenSim.Region.Framework.Scenes |
38 | { | 38 | { |
39 | #region Delegates | 39 | #region Delegates |
40 | public delegate uint GenerateClientFlagsHandler(UUID userID, UUID objectID); | 40 | public delegate uint GenerateClientFlagsHandler(ScenePresence sp, 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(); |
@@ -167,7 +167,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
167 | 167 | ||
168 | #region Object Permission Checks | 168 | #region Object Permission Checks |
169 | 169 | ||
170 | public uint GenerateClientFlags(UUID userID, UUID objectID) | 170 | public uint GenerateClientFlags(ScenePresence sp, UUID objectID) |
171 | { | 171 | { |
172 | // libomv will moan about PrimFlags.ObjectYouOfficer being | 172 | // libomv will moan about PrimFlags.ObjectYouOfficer being |
173 | // obsolete... | 173 | // obsolete... |
@@ -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(userID, objectID); | 198 | perms &= check(sp, objectID); |
199 | } | 199 | } |
200 | } | 200 | } |
201 | return perms; | 201 | return perms; |