3 files changed, 4 insertions, 3 deletions

diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
index 4bf2a82..e5e76e9 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
@@ -196,6 +196,7 @@ namespace OpenSim.Region.RegionCombinerModule
             RootRegionLandChannel.SetParcelOtherCleanTime(remoteClient, localID, otherCleanTime);
         }
 
+        public void sendClientInitialLandInfo(IClientAPI remoteClient) { }
         #endregion
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs
index 07dd68b..ddfe3e0 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)
diff --git a/OpenSim/Region/RegionCombinerModule/RegionConnections.cs b/OpenSim/Region/RegionCombinerModule/RegionConnections.cs
index 62a3a91..6bf1c4a 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionConnections.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionConnections.cs
@@ -91,4 +91,4 @@ namespace OpenSim.Region.RegionCombinerModule
             YEnd = (uint)extents.Y;
         }
     }
-}
\ No newline at end of file
+}