aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Permissions.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Permissions.cs13
1 files changed, 6 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
index 3e75c8a..9845418 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
@@ -68,8 +68,8 @@ namespace OpenSim.Region.Framework.Scenes
68 public delegate bool TerraformLandHandler(UUID user, Vector3 position, Scene requestFromScene); 68 public delegate bool TerraformLandHandler(UUID user, Vector3 position, Scene requestFromScene);
69 public delegate bool RunConsoleCommandHandler(UUID user, Scene requestFromScene); 69 public delegate bool RunConsoleCommandHandler(UUID user, Scene requestFromScene);
70 public delegate bool IssueEstateCommandHandler(UUID user, Scene requestFromScene, bool ownerCommand); 70 public delegate bool IssueEstateCommandHandler(UUID user, Scene requestFromScene, bool ownerCommand);
71 public delegate bool IsGodHandler(UUID user, Scene requestFromScene); 71 public delegate bool IsGodHandler(UUID user);
72 public delegate bool IsGridGodHandler(UUID user, Scene requestFromScene); 72 public delegate bool IsGridGodHandler(UUID user);
73 public delegate bool IsAdministratorHandler(UUID user); 73 public delegate bool IsAdministratorHandler(UUID user);
74 public delegate bool IsEstateManagerHandler(UUID user); 74 public delegate bool IsEstateManagerHandler(UUID user);
75 public delegate bool EditParcelHandler(UUID user, ILandObject parcel, Scene scene); 75 public delegate bool EditParcelHandler(UUID user, ILandObject parcel, Scene scene);
@@ -139,7 +139,6 @@ namespace OpenSim.Region.Framework.Scenes
139 public event TerraformLandHandler OnTerraformLand; 139 public event TerraformLandHandler OnTerraformLand;
140 public event RunConsoleCommandHandler OnRunConsoleCommand; 140 public event RunConsoleCommandHandler OnRunConsoleCommand;
141 public event IssueEstateCommandHandler OnIssueEstateCommand; 141 public event IssueEstateCommandHandler OnIssueEstateCommand;
142 public event IsGodHandler OnIsGod;
143 public event IsGridGodHandler OnIsGridGod; 142 public event IsGridGodHandler OnIsGridGod;
144 public event IsAdministratorHandler OnIsAdministrator; 143 public event IsAdministratorHandler OnIsAdministrator;
145 public event IsEstateManagerHandler OnIsEstateManager; 144 public event IsEstateManagerHandler OnIsEstateManager;
@@ -798,13 +797,13 @@ namespace OpenSim.Region.Framework.Scenes
798 #region CAN BE GODLIKE 797 #region CAN BE GODLIKE
799 public bool IsGod(UUID user) 798 public bool IsGod(UUID user)
800 { 799 {
801 IsGodHandler handler = OnIsGod; 800 IsAdministratorHandler handler = OnIsAdministrator;
802 if (handler != null) 801 if (handler != null)
803 { 802 {
804 Delegate[] list = handler.GetInvocationList(); 803 Delegate[] list = handler.GetInvocationList();
805 foreach (IsGodHandler h in list) 804 foreach (IsAdministratorHandler h in list)
806 { 805 {
807 if (h(user, m_scene) == false) 806 if (h(user) == false)
808 return false; 807 return false;
809 } 808 }
810 } 809 }
@@ -819,7 +818,7 @@ namespace OpenSim.Region.Framework.Scenes
819 Delegate[] list = handler.GetInvocationList(); 818 Delegate[] list = handler.GetInvocationList();
820 foreach (IsGridGodHandler h in list) 819 foreach (IsGridGodHandler h in list)
821 { 820 {
822 if (h(user, m_scene) == false) 821 if (h(user) == false)
823 return false; 822 return false;
824 } 823 }
825 } 824 }