diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs index 33ff707..be5411a 100644 --- a/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs +++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs | |||
@@ -118,7 +118,7 @@ public class RegionCombinerLargeLandChannel : ILandChannel | |||
118 | return regionData.RegionScene.LandChannel.GetLandObject(x - offsetX, y - offsetY); | 118 | return regionData.RegionScene.LandChannel.GetLandObject(x - offsetX, y - offsetY); |
119 | } | 119 | } |
120 | } | 120 | } |
121 | 121 | ||
122 | ILandObject obj = new LandObject(UUID.Zero, false, RegData.RegionScene); | 122 | ILandObject obj = new LandObject(UUID.Zero, false, RegData.RegionScene); |
123 | obj.LandData.Name = "NO LAND"; | 123 | obj.LandData.Name = "NO LAND"; |
124 | return obj; | 124 | return obj; |
@@ -142,14 +142,14 @@ public class RegionCombinerLargeLandChannel : ILandChannel | |||
142 | 142 | ||
143 | public void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) | 143 | public void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) |
144 | { | 144 | { |
145 | RootRegionLandChannel.Join(start_x, start_y, end_x, end_y, attempting_user_id); | 145 | RootRegionLandChannel.Join(start_x, start_y, end_x, end_y, attempting_user_id); |
146 | } | 146 | } |
147 | 147 | ||
148 | public void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) | 148 | public void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) |
149 | { | 149 | { |
150 | RootRegionLandChannel.Subdivide(start_x, start_y, end_x, end_y, attempting_user_id); | 150 | RootRegionLandChannel.Subdivide(start_x, start_y, end_x, end_y, attempting_user_id); |
151 | } | 151 | } |
152 | 152 | ||
153 | public void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient) | 153 | public void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient) |
154 | { | 154 | { |
155 | RootRegionLandChannel.ReturnObjectsInParcel(localID, returnType, agentIDs, taskIDs, remoteClient); | 155 | RootRegionLandChannel.ReturnObjectsInParcel(localID, returnType, agentIDs, taskIDs, remoteClient); |