aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2010-12-13 20:35:56 +0000
committerMelanie2010-12-13 20:35:56 +0000
commit9bd7f3b03a315d713d53451a36fd64c419ce5f35 (patch)
tree2c56939c277504a6b9997b825255a70df6b37cf2 /OpenSim/Region/Framework
parentChange some lookups in he Land Management module to make group permissions (diff)
downloadopensim-SC_OLD-9bd7f3b03a315d713d53451a36fd64c419ce5f35.zip
opensim-SC_OLD-9bd7f3b03a315d713d53451a36fd64c419ce5f35.tar.gz
opensim-SC_OLD-9bd7f3b03a315d713d53451a36fd64c419ce5f35.tar.bz2
opensim-SC_OLD-9bd7f3b03a315d713d53451a36fd64c419ce5f35.tar.xz
Revamp the viewer -> banlist packet processing so fix a number of bugs.
Remove the too coarse CanEditParcel method in favor of a CanEditParcelProperties method that takes a GroupPowers argument to specify what action is to be taken. Also, make the method to set parcel data much more granular. Permissions in a deeded setting should now work.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Interfaces/ILandObject.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Permissions.cs14
2 files changed, 1 insertions, 15 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/ILandObject.cs b/OpenSim/Region/Framework/Interfaces/ILandObject.cs
index 084184f..585eb00 100644
--- a/OpenSim/Region/Framework/Interfaces/ILandObject.cs
+++ b/OpenSim/Region/Framework/Interfaces/ILandObject.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Region.Framework.Interfaces
57 void SendLandUpdateToClient(bool snap_selection, IClientAPI remote_client); 57 void SendLandUpdateToClient(bool snap_selection, IClientAPI remote_client);
58 List<UUID> CreateAccessListArrayByFlag(AccessList flag); 58 List<UUID> CreateAccessListArrayByFlag(AccessList flag);
59 void SendAccessList(UUID agentID, UUID sessionID, uint flags, int sequenceID, IClientAPI remote_client); 59 void SendAccessList(UUID agentID, UUID sessionID, uint flags, int sequenceID, IClientAPI remote_client);
60 void UpdateAccessList(uint flags, List<ParcelManager.ParcelAccessEntry> entries, IClientAPI remote_client); 60 void UpdateAccessList(uint flags, UUID transactionID, int sequenceID, int sections, List<ParcelManager.ParcelAccessEntry> entries, IClientAPI remote_client);
61 void UpdateLandBitmapByteArray(); 61 void UpdateLandBitmapByteArray();
62 void SetLandBitmapFromByteArray(); 62 void SetLandBitmapFromByteArray();
63 bool[,] GetLandBitmap(); 63 bool[,] GetLandBitmap();
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
index ab0eed8..1295e58 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
@@ -722,20 +722,6 @@ namespace OpenSim.Region.Framework.Scenes
722 #endregion 722 #endregion
723 723
724 #region EDIT PARCEL 724 #region EDIT PARCEL
725 public bool CanEditParcel(UUID user, ILandObject parcel)
726 {
727 EditParcelHandler handler = OnEditParcel;
728 if (handler != null)
729 {
730 Delegate[] list = handler.GetInvocationList();
731 foreach (EditParcelHandler h in list)
732 {
733 if (h(user, parcel, m_scene) == false)
734 return false;
735 }
736 }
737 return true;
738 }
739 725
740 public bool CanEditParcelProperties(UUID user, ILandObject parcel, GroupPowers p) 726 public bool CanEditParcelProperties(UUID user, ILandObject parcel, GroupPowers p)
741 { 727 {