diff options
| author | Justin Clark-Casey (justincc) | 2010-12-14 00:12:17 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-12-14 00:12:17 +0000 |
| commit | e08da02a0fe3bcf19c6cc84023e56f81e3b1a7f5 (patch) | |
| tree | fc4a33689299573e29ad4bf1e7aa74e821cf68d9 /OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs | |
| parent | reinstate IAttachmentsModule.UpdateAttachmentPosition() since this is being u... (diff) | |
| parent | Fix a small bug in ban list handling (diff) | |
| download | opensim-SC_OLD-e08da02a0fe3bcf19c6cc84023e56f81e3b1a7f5.zip opensim-SC_OLD-e08da02a0fe3bcf19c6cc84023e56f81e3b1a7f5.tar.gz opensim-SC_OLD-e08da02a0fe3bcf19c6cc84023e56f81e3b1a7f5.tar.bz2 opensim-SC_OLD-e08da02a0fe3bcf19c6cc84023e56f81e3b1a7f5.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs')
| -rw-r--r-- | OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs | 4 |
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) |