diff options
author | Melanie Thielker | 2010-07-29 16:33:20 +0200 |
---|---|---|
committer | Melanie Thielker | 2010-07-29 16:33:20 +0200 |
commit | 7871dd606eb8c827101ee4ee3c64d00139e1a0b4 (patch) | |
tree | e51c9a91c18a45364faa42035beddcfe63583029 /OpenSim/Region/Framework/Scenes/Scene.Permissions.cs | |
parent | Eat a lockign exception that kills scripts. May bear more investigation (diff) | |
download | opensim-SC_OLD-7871dd606eb8c827101ee4ee3c64d00139e1a0b4.zip opensim-SC_OLD-7871dd606eb8c827101ee4ee3c64d00139e1a0b4.tar.gz opensim-SC_OLD-7871dd606eb8c827101ee4ee3c64d00139e1a0b4.tar.bz2 opensim-SC_OLD-7871dd606eb8c827101ee4ee3c64d00139e1a0b4.tar.xz |
Allow gods and estate managers/owners to be unaffected by parcel bans
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Permissions.cs | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs index 7dab04f..a523351 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs | |||
@@ -64,6 +64,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
64 | public delegate bool RunConsoleCommandHandler(UUID user, Scene requestFromScene); | 64 | public delegate bool RunConsoleCommandHandler(UUID user, Scene requestFromScene); |
65 | public delegate bool IssueEstateCommandHandler(UUID user, Scene requestFromScene, bool ownerCommand); | 65 | public delegate bool IssueEstateCommandHandler(UUID user, Scene requestFromScene, bool ownerCommand); |
66 | public delegate bool IsGodHandler(UUID user, Scene requestFromScene); | 66 | public delegate bool IsGodHandler(UUID user, Scene requestFromScene); |
67 | public delegate bool IsAdministratorHandler(UUID user); | ||
67 | public delegate bool EditParcelHandler(UUID user, ILandObject parcel, Scene scene); | 68 | public delegate bool EditParcelHandler(UUID user, ILandObject parcel, Scene scene); |
68 | public delegate bool SellParcelHandler(UUID user, ILandObject parcel, Scene scene); | 69 | public delegate bool SellParcelHandler(UUID user, ILandObject parcel, Scene scene); |
69 | public delegate bool AbandonParcelHandler(UUID user, ILandObject parcel, Scene scene); | 70 | public delegate bool AbandonParcelHandler(UUID user, ILandObject parcel, Scene scene); |
@@ -122,6 +123,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
122 | public event RunConsoleCommandHandler OnRunConsoleCommand; | 123 | public event RunConsoleCommandHandler OnRunConsoleCommand; |
123 | public event IssueEstateCommandHandler OnIssueEstateCommand; | 124 | public event IssueEstateCommandHandler OnIssueEstateCommand; |
124 | public event IsGodHandler OnIsGod; | 125 | public event IsGodHandler OnIsGod; |
126 | public event IsAdministratorHandler OnIsAdministrator; | ||
125 | public event EditParcelHandler OnEditParcel; | 127 | public event EditParcelHandler OnEditParcel; |
126 | public event SellParcelHandler OnSellParcel; | 128 | public event SellParcelHandler OnSellParcel; |
127 | public event AbandonParcelHandler OnAbandonParcel; | 129 | public event AbandonParcelHandler OnAbandonParcel; |
@@ -652,6 +654,21 @@ namespace OpenSim.Region.Framework.Scenes | |||
652 | } | 654 | } |
653 | return true; | 655 | return true; |
654 | } | 656 | } |
657 | |||
658 | public bool IsAdministrator(UUID user) | ||
659 | { | ||
660 | IsAdministratorHandler handler = OnIsAdministrator; | ||
661 | if (handler != null) | ||
662 | { | ||
663 | Delegate[] list = handler.GetInvocationList(); | ||
664 | foreach (IsAdministratorHandler h in list) | ||
665 | { | ||
666 | if (h(user) == false) | ||
667 | return false; | ||
668 | } | ||
669 | } | ||
670 | return true; | ||
671 | } | ||
655 | #endregion | 672 | #endregion |
656 | 673 | ||
657 | #region EDIT PARCEL | 674 | #region EDIT PARCEL |