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 | |
| parent | reinstate IAttachmentsModule.UpdateAttachmentPosition() since this is being u... (diff) | |
| parent | Fix a small bug in ban list handling (diff) | |
| download | opensim-SC-e08da02a0fe3bcf19c6cc84023e56f81e3b1a7f5.zip opensim-SC-e08da02a0fe3bcf19c6cc84023e56f81e3b1a7f5.tar.gz opensim-SC-e08da02a0fe3bcf19c6cc84023e56f81e3b1a7f5.tar.bz2 opensim-SC-e08da02a0fe3bcf19c6cc84023e56f81e3b1a7f5.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs index ff0e743..4a24c7d 100644 --- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs +++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | |||
| @@ -1001,7 +1001,7 @@ namespace OpenSim.Region.RegionCombinerModule | |||
| 1001 | VirtualRegion.Permissions.OnDuplicateObject += BigRegion.PermissionModule.CanDuplicateObject; | 1001 | VirtualRegion.Permissions.OnDuplicateObject += BigRegion.PermissionModule.CanDuplicateObject; |
| 1002 | VirtualRegion.Permissions.OnDeleteObject += BigRegion.PermissionModule.CanDeleteObject; //MAYBE FULLY IMPLEMENTED | 1002 | VirtualRegion.Permissions.OnDeleteObject += BigRegion.PermissionModule.CanDeleteObject; //MAYBE FULLY IMPLEMENTED |
| 1003 | VirtualRegion.Permissions.OnEditObject += BigRegion.PermissionModule.CanEditObject; //MAYBE FULLY IMPLEMENTED | 1003 | VirtualRegion.Permissions.OnEditObject += BigRegion.PermissionModule.CanEditObject; //MAYBE FULLY IMPLEMENTED |
| 1004 | VirtualRegion.Permissions.OnEditParcel += BigRegion.PermissionModule.CanEditParcel; //MAYBE FULLY IMPLEMENTED | 1004 | VirtualRegion.Permissions.OnEditParcelProperties += BigRegion.PermissionModule.CanEditParcelProperties; //MAYBE FULLY IMPLEMENTED |
| 1005 | VirtualRegion.Permissions.OnInstantMessage += BigRegion.PermissionModule.CanInstantMessage; | 1005 | VirtualRegion.Permissions.OnInstantMessage += BigRegion.PermissionModule.CanInstantMessage; |
| 1006 | VirtualRegion.Permissions.OnInventoryTransfer += BigRegion.PermissionModule.CanInventoryTransfer; //NOT YET IMPLEMENTED | 1006 | VirtualRegion.Permissions.OnInventoryTransfer += BigRegion.PermissionModule.CanInventoryTransfer; //NOT YET IMPLEMENTED |
| 1007 | VirtualRegion.Permissions.OnIssueEstateCommand += BigRegion.PermissionModule.CanIssueEstateCommand; //FULLY IMPLEMENTED | 1007 | VirtualRegion.Permissions.OnIssueEstateCommand += BigRegion.PermissionModule.CanIssueEstateCommand; //FULLY IMPLEMENTED |
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) |