Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current

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
             return m_rootScene.Permissions.CanEditObject(objectid, editorid);
         }
 
-        public bool CanEditParcelProperties(UUID user, ILandObject parcel, GroupPowers g, Scene scene)
+        public bool CanEditParcelProperties(UUID user, ILandObject parcel, GroupPowers g, Scene scene, bool allowManager)
         {
-            return m_rootScene.Permissions.CanEditParcelProperties(user, parcel, g);
+            return m_rootScene.Permissions.CanEditParcelProperties(user, parcel, g, allowManager);
         }
 
         public bool CanInstantMessage(UUID user, UUID target, Scene startscene)