diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs index b2456a2..ca03035 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs | |||
@@ -162,8 +162,8 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
162 | ILandObject fullSimParcel = new LandObject(LLUUID.Zero, false, m_scene); | 162 | ILandObject fullSimParcel = new LandObject(LLUUID.Zero, false, m_scene); |
163 | 163 | ||
164 | fullSimParcel.setLandBitmap(fullSimParcel.getSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize)); | 164 | fullSimParcel.setLandBitmap(fullSimParcel.getSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize)); |
165 | fullSimParcel.landData.ownerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; | 165 | fullSimParcel.landData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; |
166 | fullSimParcel.landData.claimDate = Util.UnixTimeSinceEpoch(); | 166 | fullSimParcel.landData.ClaimDate = Util.UnixTimeSinceEpoch(); |
167 | AddLandObject(fullSimParcel); | 167 | AddLandObject(fullSimParcel); |
168 | } | 168 | } |
169 | 169 | ||
@@ -279,18 +279,18 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
279 | if (!avatar.IsChildAgent) | 279 | if (!avatar.IsChildAgent) |
280 | { | 280 | { |
281 | over.sendLandUpdateToClient(avatar.ControllingClient); | 281 | over.sendLandUpdateToClient(avatar.ControllingClient); |
282 | m_scene.EventManager.TriggerAvatarEnteringNewParcel(avatar, over.landData.localID, | 282 | m_scene.EventManager.TriggerAvatarEnteringNewParcel(avatar, over.landData.LocalID, |
283 | m_scene.RegionInfo.RegionID); | 283 | m_scene.RegionInfo.RegionID); |
284 | } | 284 | } |
285 | } | 285 | } |
286 | 286 | ||
287 | if (avatar.currentParcelUUID != over.landData.globalID) | 287 | if (avatar.currentParcelUUID != over.landData.GlobalID) |
288 | { | 288 | { |
289 | if (!avatar.IsChildAgent) | 289 | if (!avatar.IsChildAgent) |
290 | { | 290 | { |
291 | over.sendLandUpdateToClient(avatar.ControllingClient); | 291 | over.sendLandUpdateToClient(avatar.ControllingClient); |
292 | avatar.currentParcelUUID = over.landData.globalID; | 292 | avatar.currentParcelUUID = over.landData.GlobalID; |
293 | m_scene.EventManager.TriggerAvatarEnteringNewParcel(avatar, over.landData.localID, | 293 | m_scene.EventManager.TriggerAvatarEnteringNewParcel(avatar, over.landData.LocalID, |
294 | m_scene.RegionInfo.RegionID); | 294 | m_scene.RegionInfo.RegionID); |
295 | } | 295 | } |
296 | } | 296 | } |
@@ -316,7 +316,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
316 | if (clientAvatar.AbsolutePosition.Z < LandChannel.BAN_LINE_SAFETY_HIEGHT && | 316 | if (clientAvatar.AbsolutePosition.Z < LandChannel.BAN_LINE_SAFETY_HIEGHT && |
317 | clientAvatar.sentMessageAboutRestrictedParcelFlyingDown) | 317 | clientAvatar.sentMessageAboutRestrictedParcelFlyingDown) |
318 | { | 318 | { |
319 | handleAvatarChangingParcel(clientAvatar, parcel.landData.localID, m_scene.RegionInfo.RegionID); | 319 | handleAvatarChangingParcel(clientAvatar, parcel.landData.LocalID, m_scene.RegionInfo.RegionID); |
320 | //They are going below the safety line! | 320 | //They are going below the safety line! |
321 | if (!parcel.isBannedFromLand(clientAvatar.UUID)) | 321 | if (!parcel.isBannedFromLand(clientAvatar.UUID)) |
322 | { | 322 | { |
@@ -362,7 +362,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
362 | { | 362 | { |
363 | if (landList.ContainsKey(landLocalID)) | 363 | if (landList.ContainsKey(landLocalID)) |
364 | { | 364 | { |
365 | if (agentID == landList[landLocalID].landData.ownerID) | 365 | if (agentID == landList[landLocalID].landData.OwnerID) |
366 | { | 366 | { |
367 | landList[landLocalID].updateAccessList(flags, entries, remote_client); | 367 | landList[landLocalID].updateAccessList(flags, entries, remote_client); |
368 | } | 368 | } |
@@ -388,7 +388,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
388 | public ILandObject AddLandObject(ILandObject new_land) | 388 | public ILandObject AddLandObject(ILandObject new_land) |
389 | { | 389 | { |
390 | lastLandLocalID++; | 390 | lastLandLocalID++; |
391 | new_land.landData.localID = lastLandLocalID; | 391 | new_land.landData.LocalID = lastLandLocalID; |
392 | landList.Add(lastLandLocalID, new_land.Copy()); | 392 | landList.Add(lastLandLocalID, new_land.Copy()); |
393 | 393 | ||
394 | 394 | ||
@@ -430,7 +430,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
430 | } | 430 | } |
431 | } | 431 | } |
432 | 432 | ||
433 | m_scene.EventManager.TriggerLandObjectRemoved(landList[local_id].landData.globalID); | 433 | m_scene.EventManager.TriggerLandObjectRemoved(landList[local_id].landData.GlobalID); |
434 | landList.Remove(local_id); | 434 | landList.Remove(local_id); |
435 | } | 435 | } |
436 | 436 | ||
@@ -445,13 +445,13 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
445 | { | 445 | { |
446 | if (landBitmapSlave[x, y]) | 446 | if (landBitmapSlave[x, y]) |
447 | { | 447 | { |
448 | landIDList[x, y] = master.landData.localID; | 448 | landIDList[x, y] = master.landData.LocalID; |
449 | } | 449 | } |
450 | } | 450 | } |
451 | } | 451 | } |
452 | 452 | ||
453 | removeLandObject(slave.landData.localID); | 453 | removeLandObject(slave.landData.LocalID); |
454 | UpdateLandObject(master.landData.localID, master.landData); | 454 | UpdateLandObject(master.landData.LocalID, master.landData); |
455 | } | 455 | } |
456 | 456 | ||
457 | public ILandObject GetLandObject(int parcelLocalID) | 457 | public ILandObject GetLandObject(int parcelLocalID) |
@@ -550,15 +550,15 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
550 | Dictionary<LLUUID, List<LandObject>> landOwnersAndParcels = new Dictionary<LLUUID, List<LandObject>>(); | 550 | Dictionary<LLUUID, List<LandObject>> landOwnersAndParcels = new Dictionary<LLUUID, List<LandObject>>(); |
551 | foreach (LandObject p in landList.Values) | 551 | foreach (LandObject p in landList.Values) |
552 | { | 552 | { |
553 | if (!landOwnersAndParcels.ContainsKey(p.landData.ownerID)) | 553 | if (!landOwnersAndParcels.ContainsKey(p.landData.OwnerID)) |
554 | { | 554 | { |
555 | List<LandObject> tempList = new List<LandObject>(); | 555 | List<LandObject> tempList = new List<LandObject>(); |
556 | tempList.Add(p); | 556 | tempList.Add(p); |
557 | landOwnersAndParcels.Add(p.landData.ownerID, tempList); | 557 | landOwnersAndParcels.Add(p.landData.OwnerID, tempList); |
558 | } | 558 | } |
559 | else | 559 | else |
560 | { | 560 | { |
561 | landOwnersAndParcels[p.landData.ownerID].Add(p); | 561 | landOwnersAndParcels[p.landData.OwnerID].Add(p); |
562 | } | 562 | } |
563 | } | 563 | } |
564 | 564 | ||
@@ -568,15 +568,15 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
568 | int simPrims = 0; | 568 | int simPrims = 0; |
569 | foreach (LandObject p in landOwnersAndParcels[owner]) | 569 | foreach (LandObject p in landOwnersAndParcels[owner]) |
570 | { | 570 | { |
571 | simArea += p.landData.area; | 571 | simArea += p.landData.Area; |
572 | simPrims += p.landData.ownerPrims + p.landData.otherPrims + p.landData.groupPrims + | 572 | simPrims += p.landData.OwnerPrims + p.landData.OtherPrims + p.landData.GroupPrims + |
573 | p.landData.selectedPrims; | 573 | p.landData.SelectedPrims; |
574 | } | 574 | } |
575 | 575 | ||
576 | foreach (LandObject p in landOwnersAndParcels[owner]) | 576 | foreach (LandObject p in landOwnersAndParcels[owner]) |
577 | { | 577 | { |
578 | p.landData.simwideArea = simArea; | 578 | p.landData.SimwideArea = simArea; |
579 | p.landData.simwidePrims = simPrims; | 579 | p.landData.SimwidePrims = simPrims; |
580 | } | 580 | } |
581 | } | 581 | } |
582 | } | 582 | } |
@@ -658,13 +658,13 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
658 | 658 | ||
659 | //Lets create a new land object with bitmap activated at that point (keeping the old land objects info) | 659 | //Lets create a new land object with bitmap activated at that point (keeping the old land objects info) |
660 | ILandObject newLand = startLandObject.Copy(); | 660 | ILandObject newLand = startLandObject.Copy(); |
661 | newLand.landData.landName = "Subdivision of " + newLand.landData.landName; | 661 | newLand.landData.Name = "Subdivision of " + newLand.landData.Name; |
662 | newLand.landData.globalID = LLUUID.Random(); | 662 | newLand.landData.GlobalID = LLUUID.Random(); |
663 | 663 | ||
664 | newLand.setLandBitmap(newLand.getSquareLandBitmap(start_x, start_y, end_x, end_y)); | 664 | newLand.setLandBitmap(newLand.getSquareLandBitmap(start_x, start_y, end_x, end_y)); |
665 | 665 | ||
666 | //Now, lets set the subdivision area of the original to false | 666 | //Now, lets set the subdivision area of the original to false |
667 | int startLandObjectIndex = startLandObject.landData.localID; | 667 | int startLandObjectIndex = startLandObject.landData.LocalID; |
668 | landList[startLandObjectIndex].setLandBitmap( | 668 | landList[startLandObjectIndex].setLandBitmap( |
669 | newLand.modifyLandBitmapSquare(startLandObject.getLandBitmap(), start_x, start_y, end_x, end_y, false)); | 669 | newLand.modifyLandBitmapSquare(startLandObject.getLandBitmap(), start_x, start_y, end_x, end_y, false)); |
670 | landList[startLandObjectIndex].forceUpdateLandInfo(); | 670 | landList[startLandObjectIndex].forceUpdateLandInfo(); |
@@ -673,7 +673,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
673 | 673 | ||
674 | //Now add the new land object | 674 | //Now add the new land object |
675 | ILandObject result = AddLandObject(newLand); | 675 | ILandObject result = AddLandObject(newLand); |
676 | UpdateLandObject(startLandObject.landData.localID, startLandObject.landData); | 676 | UpdateLandObject(startLandObject.landData.LocalID, startLandObject.landData); |
677 | result.sendLandUpdateToAvatarsOverMe(); | 677 | result.sendLandUpdateToAvatarsOverMe(); |
678 | 678 | ||
679 | 679 | ||
@@ -726,14 +726,14 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
726 | } | 726 | } |
727 | foreach (ILandObject p in selectedLandObjects) | 727 | foreach (ILandObject p in selectedLandObjects) |
728 | { | 728 | { |
729 | if (p.landData.ownerID != masterLandObject.landData.ownerID) | 729 | if (p.landData.OwnerID != masterLandObject.landData.OwnerID) |
730 | { | 730 | { |
731 | return; | 731 | return; |
732 | } | 732 | } |
733 | } | 733 | } |
734 | foreach (ILandObject slaveLandObject in selectedLandObjects) | 734 | foreach (ILandObject slaveLandObject in selectedLandObjects) |
735 | { | 735 | { |
736 | landList[masterLandObject.landData.localID].setLandBitmap( | 736 | landList[masterLandObject.landData.LocalID].setLandBitmap( |
737 | slaveLandObject.mergeLandBitmaps(masterLandObject.getLandBitmap(), slaveLandObject.getLandBitmap())); | 737 | slaveLandObject.mergeLandBitmaps(masterLandObject.getLandBitmap(), slaveLandObject.getLandBitmap())); |
738 | performFinalLandJoin(masterLandObject, slaveLandObject); | 738 | performFinalLandJoin(masterLandObject, slaveLandObject); |
739 | } | 739 | } |
@@ -775,19 +775,19 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
775 | 775 | ||
776 | if (currentParcelBlock != null) | 776 | if (currentParcelBlock != null) |
777 | { | 777 | { |
778 | if (currentParcelBlock.landData.ownerID == remote_client.AgentId) | 778 | if (currentParcelBlock.landData.OwnerID == remote_client.AgentId) |
779 | { | 779 | { |
780 | //Owner Flag | 780 | //Owner Flag |
781 | tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_OWNED_BY_REQUESTER); | 781 | tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_OWNED_BY_REQUESTER); |
782 | } | 782 | } |
783 | else if (currentParcelBlock.landData.salePrice > 0 && | 783 | else if (currentParcelBlock.landData.SalePrice > 0 && |
784 | (currentParcelBlock.landData.authBuyerID == LLUUID.Zero || | 784 | (currentParcelBlock.landData.AuthBuyerID == LLUUID.Zero || |
785 | currentParcelBlock.landData.authBuyerID == remote_client.AgentId)) | 785 | currentParcelBlock.landData.AuthBuyerID == remote_client.AgentId)) |
786 | { | 786 | { |
787 | //Sale Flag | 787 | //Sale Flag |
788 | tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_IS_FOR_SALE); | 788 | tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_IS_FOR_SALE); |
789 | } | 789 | } |
790 | else if (currentParcelBlock.landData.ownerID == LLUUID.Zero) | 790 | else if (currentParcelBlock.landData.OwnerID == LLUUID.Zero) |
791 | { | 791 | { |
792 | //Public Flag | 792 | //Public Flag |
793 | tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_PUBLIC); | 793 | tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_PUBLIC); |
@@ -931,7 +931,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
931 | { | 931 | { |
932 | if (m_scene.ExternalChecks.ExternalChecksCanAbandonParcel(remote_client.AgentId, landList[local_id])) | 932 | if (m_scene.ExternalChecks.ExternalChecksCanAbandonParcel(remote_client.AgentId, landList[local_id])) |
933 | { | 933 | { |
934 | landList[local_id].landData.ownerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; | 934 | landList[local_id].landData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; |
935 | m_scene.Broadcast(SendParcelOverlay); | 935 | m_scene.Broadcast(SendParcelOverlay); |
936 | landList[local_id].sendLandUpdateToClient(remote_client); | 936 | landList[local_id].sendLandUpdateToClient(remote_client); |
937 | } | 937 | } |
@@ -945,8 +945,8 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
945 | { | 945 | { |
946 | if (m_scene.ExternalChecks.ExternalChecksCanReclaimParcel(remote_client.AgentId, landList[local_id])) | 946 | if (m_scene.ExternalChecks.ExternalChecksCanReclaimParcel(remote_client.AgentId, landList[local_id])) |
947 | { | 947 | { |
948 | landList[local_id].landData.ownerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; | 948 | landList[local_id].landData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; |
949 | landList[local_id].landData.claimDate = Util.UnixTimeSinceEpoch(); | 949 | landList[local_id].landData.ClaimDate = Util.UnixTimeSinceEpoch(); |
950 | m_scene.Broadcast(SendParcelOverlay); | 950 | m_scene.Broadcast(SendParcelOverlay); |
951 | landList[local_id].sendLandUpdateToClient(remote_client); | 951 | landList[local_id].sendLandUpdateToClient(remote_client); |
952 | } | 952 | } |
@@ -992,11 +992,11 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
992 | } | 992 | } |
993 | if (lob != null) | 993 | if (lob != null) |
994 | { | 994 | { |
995 | LLUUID AuthorizedID = lob.landData.authBuyerID; | 995 | LLUUID AuthorizedID = lob.landData.AuthBuyerID; |
996 | int saleprice = lob.landData.salePrice; | 996 | int saleprice = lob.landData.SalePrice; |
997 | LLUUID pOwnerID = lob.landData.ownerID; | 997 | LLUUID pOwnerID = lob.landData.OwnerID; |
998 | 998 | ||
999 | bool landforsale = ((lob.landData.landFlags & | 999 | bool landforsale = ((lob.landData.Flags & |
1000 | (uint)(Parcel.ParcelFlags.ForSale | Parcel.ParcelFlags.ForSaleObjects | Parcel.ParcelFlags.SellParcelObjects)) != 0); | 1000 | (uint)(Parcel.ParcelFlags.ForSale | Parcel.ParcelFlags.ForSaleObjects | Parcel.ParcelFlags.SellParcelObjects)) != 0); |
1001 | if ((AuthorizedID == LLUUID.Zero || AuthorizedID == e.agentId) && e.parcelPrice >= saleprice && landforsale) | 1001 | if ((AuthorizedID == LLUUID.Zero || AuthorizedID == e.agentId) && e.parcelPrice >= saleprice && landforsale) |
1002 | { | 1002 | { |
@@ -1034,7 +1034,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
1034 | 1034 | ||
1035 | public void IncomingLandObjectFromStorage(LandData data) | 1035 | public void IncomingLandObjectFromStorage(LandData data) |
1036 | { | 1036 | { |
1037 | ILandObject new_land = new LandObject(data.ownerID, data.isGroupOwned, m_scene); | 1037 | ILandObject new_land = new LandObject(data.OwnerID, data.IsGroupOwned, m_scene); |
1038 | new_land.landData = data.Copy(); | 1038 | new_land.landData = data.Copy(); |
1039 | new_land.setLandBitmapFromByteArray(); | 1039 | new_land.setLandBitmapFromByteArray(); |
1040 | AddLandObject(new_land); | 1040 | AddLandObject(new_land); |