diff options
author | UbitUmarov | 2015-12-14 12:47:17 +0000 |
---|---|---|
committer | UbitUmarov | 2015-12-14 12:47:17 +0000 |
commit | 35b88b65803f6f9a48a21a4cc159363a159c9010 (patch) | |
tree | e8bc35e1464448b7ef7dfebbecb2933716ced1d5 /OpenSim/Region/CoreModules/World/Land | |
parent | on join parcels, keep the information of the larger parcel, since thats how i... (diff) | |
download | opensim-SC_OLD-35b88b65803f6f9a48a21a4cc159363a159c9010.zip opensim-SC_OLD-35b88b65803f6f9a48a21a4cc159363a159c9010.tar.gz opensim-SC_OLD-35b88b65803f6f9a48a21a4cc159363a159c9010.tar.bz2 opensim-SC_OLD-35b88b65803f6f9a48a21a4cc159363a159c9010.tar.xz |
removed unneeded funtions
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 08b9896..ebf106a 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -944,7 +944,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
944 | /// <param name="end_y">North Point</param> | 944 | /// <param name="end_y">North Point</param> |
945 | /// <param name="attempting_user_id">UUID of user who is trying to subdivide</param> | 945 | /// <param name="attempting_user_id">UUID of user who is trying to subdivide</param> |
946 | /// <returns>Returns true if successful</returns> | 946 | /// <returns>Returns true if successful</returns> |
947 | private void subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) | 947 | public void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) |
948 | { | 948 | { |
949 | //First, lets loop through the points and make sure they are all in the same peice of land | 949 | //First, lets loop through the points and make sure they are all in the same peice of land |
950 | //Get the land object at start | 950 | //Get the land object at start |
@@ -1037,7 +1037,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1037 | /// <param name="end_y">end y of selection area</param> | 1037 | /// <param name="end_y">end y of selection area</param> |
1038 | /// <param name="attempting_user_id">UUID of the avatar trying to join the land objects</param> | 1038 | /// <param name="attempting_user_id">UUID of the avatar trying to join the land objects</param> |
1039 | /// <returns>Returns true if successful</returns> | 1039 | /// <returns>Returns true if successful</returns> |
1040 | private void join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) | 1040 | public void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) |
1041 | { | 1041 | { |
1042 | int index = 0; | 1042 | int index = 0; |
1043 | int maxindex = -1; | 1043 | int maxindex = -1; |
@@ -1098,17 +1098,6 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1098 | masterLandObject.SendLandUpdateToAvatarsOverMe(); | 1098 | masterLandObject.SendLandUpdateToAvatarsOverMe(); |
1099 | m_scene.ForEachClient(SendParcelOverlay); | 1099 | m_scene.ForEachClient(SendParcelOverlay); |
1100 | } | 1100 | } |
1101 | |||
1102 | public void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) | ||
1103 | { | ||
1104 | join(start_x, start_y, end_x, end_y, attempting_user_id); | ||
1105 | } | ||
1106 | |||
1107 | public void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) | ||
1108 | { | ||
1109 | subdivide(start_x, start_y, end_x, end_y, attempting_user_id); | ||
1110 | } | ||
1111 | |||
1112 | #endregion | 1101 | #endregion |
1113 | 1102 | ||
1114 | #region Parcel Updating | 1103 | #region Parcel Updating |
@@ -1334,12 +1323,12 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1334 | 1323 | ||
1335 | public void ClientOnParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client) | 1324 | public void ClientOnParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client) |
1336 | { | 1325 | { |
1337 | subdivide(west, south, east, north, remote_client.AgentId); | 1326 | Subdivide(west, south, east, north, remote_client.AgentId); |
1338 | } | 1327 | } |
1339 | 1328 | ||
1340 | public void ClientOnParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client) | 1329 | public void ClientOnParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client) |
1341 | { | 1330 | { |
1342 | join(west, south, east, north, remote_client.AgentId); | 1331 | Join(west, south, east, north, remote_client.AgentId); |
1343 | } | 1332 | } |
1344 | 1333 | ||
1345 | public void ClientOnParcelSelectObjects(int local_id, int request_type, | 1334 | public void ClientOnParcelSelectObjects(int local_id, int request_type, |