aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorMelanie Thielker2008-08-14 18:08:22 +0000
committerMelanie Thielker2008-08-14 18:08:22 +0000
commitc2f1771c63108c78b799a4f107cabe7e33984866 (patch)
tree40b76fc02e6ec938d841f3d51f11417131cfb850 /OpenSim/Region/Environment/Scenes
parentMantis #1953 (diff)
downloadopensim-SC-c2f1771c63108c78b799a4f107cabe7e33984866.zip
opensim-SC-c2f1771c63108c78b799a4f107cabe7e33984866.tar.gz
opensim-SC-c2f1771c63108c78b799a4f107cabe7e33984866.tar.bz2
opensim-SC-c2f1771c63108c78b799a4f107cabe7e33984866.tar.xz
Make the estate owner work. Changes permissions checks to allow the
estate owner user the ability to add and remove estate managers, and have EM rights outside of that.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs b/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs
index c7d1ce2..0b2cc9e 100644
--- a/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs
@@ -761,7 +761,7 @@ namespace OpenSim.Region.Environment.Scenes
761 #endregion 761 #endregion
762 762
763 #region CAN ISSUE ESTATE COMMAND 763 #region CAN ISSUE ESTATE COMMAND
764 public delegate bool CanIssueEstateCommand(LLUUID user, Scene requestFromScene); 764 public delegate bool CanIssueEstateCommand(LLUUID user, Scene requestFromScene, bool ownerCommand);
765 private List<CanIssueEstateCommand> CanIssueEstateCommandCheckFunctions = new List<CanIssueEstateCommand>(); 765 private List<CanIssueEstateCommand> CanIssueEstateCommandCheckFunctions = new List<CanIssueEstateCommand>();
766 766
767 public void addCheckIssueEstateCommand(CanIssueEstateCommand delegateFunc) 767 public void addCheckIssueEstateCommand(CanIssueEstateCommand delegateFunc)
@@ -775,11 +775,11 @@ namespace OpenSim.Region.Environment.Scenes
775 CanIssueEstateCommandCheckFunctions.Remove(delegateFunc); 775 CanIssueEstateCommandCheckFunctions.Remove(delegateFunc);
776 } 776 }
777 777
778 public bool ExternalChecksCanIssueEstateCommand(LLUUID user) 778 public bool ExternalChecksCanIssueEstateCommand(LLUUID user, bool ownerCommand)
779 { 779 {
780 foreach (CanIssueEstateCommand check in CanIssueEstateCommandCheckFunctions) 780 foreach (CanIssueEstateCommand check in CanIssueEstateCommandCheckFunctions)
781 { 781 {
782 if (check(user, m_scene) == false) 782 if (check(user, m_scene, ownerCommand) == false)
783 { 783 {
784 return false; 784 return false;
785 } 785 }