diff options
| author | Melanie Thielker | 2014-04-26 20:32:27 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-04-26 20:32:27 +0200 |
| commit | d97896d39a50cdcbf1d96a9a9382b4dde7b76b53 (patch) | |
| tree | b0e7700519756379b280e1337b1c53f7e5e6cbd6 /OpenSim/Region/RegionCombinerModule | |
| parent | Convert region loading to new format (diff) | |
| download | opensim-SC_OLD-d97896d39a50cdcbf1d96a9a9382b4dde7b76b53.zip opensim-SC_OLD-d97896d39a50cdcbf1d96a9a9382b4dde7b76b53.tar.gz opensim-SC_OLD-d97896d39a50cdcbf1d96a9a9382b4dde7b76b53.tar.bz2 opensim-SC_OLD-d97896d39a50cdcbf1d96a9a9382b4dde7b76b53.tar.xz | |
Differentiate between requests only the owner should be able to do and those
that managers can do when setting parcel data
Diffstat (limited to 'OpenSim/Region/RegionCombinerModule')
| -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 7c662c9..40ed3fd 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 CanEditParcelProperties(UUID user, ILandObject parcel, GroupPowers g, Scene scene) | 108 | public bool CanEditParcelProperties(UUID user, ILandObject parcel, GroupPowers g, Scene scene, bool allowManager) |
| 109 | { | 109 | { |
| 110 | return m_rootScene.Permissions.CanEditParcelProperties(user, parcel, g); | 110 | return m_rootScene.Permissions.CanEditParcelProperties(user, parcel, g, allowManager); |
| 111 | } | 111 | } |
| 112 | 112 | ||
| 113 | public bool CanInstantMessage(UUID user, UUID target, Scene startscene) | 113 | public bool CanInstantMessage(UUID user, UUID target, Scene startscene) |