mirror of
https://github.com/opensim/opensim.git
synced 2026-08-05 17:05:55 +08:00
Merge branch 'master' into careminster-presence-refactor
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user