From 4c740e1717f8071d48e34c584728fddcf05afdb2 Mon Sep 17 00:00:00 2001
From: OpenSim Master
Date: Thu, 29 Apr 2010 11:57:30 -0700
Subject: Implements three new OSSL functions for parcel management:
 osParcelJoin joins parcels in an area, osParcelSubdivide splits parcels in an
 area, osParcelSetDetails sets parcel name, description, owner and group
 owner. Join and Subdivide methods in LandChannel are exposed.

---
 .../RegionCombinerModule/RegionCombinerLargeLandChannel.cs     | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'OpenSim/Region/RegionCombinerModule')

diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
index 9da818a..33ff707 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
@@ -140,6 +140,16 @@ public class RegionCombinerLargeLandChannel : ILandChannel
             RootRegionLandChannel.UpdateLandObject(localID, data);
         }
 
+        public void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id)
+        {
+	    RootRegionLandChannel.Join(start_x, start_y, end_x, end_y, attempting_user_id);
+        }
+
+        public void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id)
+        {
+            RootRegionLandChannel.Subdivide(start_x, start_y, end_x, end_y, attempting_user_id);
+        }
+        
         public void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient)
         {
             RootRegionLandChannel.ReturnObjectsInParcel(localID, returnType, agentIDs, taskIDs, remoteClient);
-- 
cgit v1.1