aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs
diff options
context:
space:
mode:
authorMelanie2010-12-13 20:19:52 +0100
committerMelanie2010-12-13 20:19:52 +0100
commit6b374fa54767a22c1d236470c8a19ee59b44d937 (patch)
tree489eb8847b445bd652b89683c55e3545fc7c6ad8 /OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs
parentChange some lookups in he Land Management module to make group permissions (diff)
downloadopensim-SC-6b374fa54767a22c1d236470c8a19ee59b44d937.zip
opensim-SC-6b374fa54767a22c1d236470c8a19ee59b44d937.tar.gz
opensim-SC-6b374fa54767a22c1d236470c8a19ee59b44d937.tar.bz2
opensim-SC-6b374fa54767a22c1d236470c8a19ee59b44d937.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/RegionCombinerModule/RegionCombinerPermissionModule.cs')
-rw-r--r--OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs
index 393322d..7c662c9 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs
@@ -105,9 +105,9 @@ namespace OpenSim.Region.RegionCombinerModule
105 return m_rootScene.Permissions.CanEditObject(objectid, editorid); 105 return m_rootScene.Permissions.CanEditObject(objectid, editorid);
106 } 106 }
107 107
108 public bool CanEditParcel(UUID user, ILandObject parcel, Scene scene) 108 public bool CanEditParcelProperties(UUID user, ILandObject parcel, GroupPowers g, Scene scene)
109 { 109 {
110 return m_rootScene.Permissions.CanEditParcel(user, parcel); 110 return m_rootScene.Permissions.CanEditParcelProperties(user, parcel, g);
111 } 111 }
112 112
113 public bool CanInstantMessage(UUID user, UUID target, Scene startscene) 113 public bool CanInstantMessage(UUID user, UUID target, Scene startscene)