diff options
author | Sean Dague | 2008-07-23 15:50:32 +0000 |
---|---|---|
committer | Sean Dague | 2008-07-23 15:50:32 +0000 |
commit | 090159defc731fca252b2b3520364712760f0f4e (patch) | |
tree | 78fe9dde5a9902d67aa6d1690cf575d778d154f2 /OpenSim/Region/ClientStack/LindenUDP | |
parent | Send Animation data for other avatars to new users joining the region (tested... (diff) | |
download | opensim-SC_OLD-090159defc731fca252b2b3520364712760f0f4e.zip opensim-SC_OLD-090159defc731fca252b2b3520364712760f0f4e.tar.gz opensim-SC_OLD-090159defc731fca252b2b3520364712760f0f4e.tar.bz2 opensim-SC_OLD-090159defc731fca252b2b3520364712760f0f4e.tar.xz |
refactored LandData to use properties, and cleaned up the naming on
the properties a bit to be more consistant with other objects (having things
like .Name .Description, etc).
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 7141e13..d1fd63c 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -2703,22 +2703,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2703 | 2703 | ||
2704 | updatePacket.ParcelData.AABBMax = landData.AABBMax; | 2704 | updatePacket.ParcelData.AABBMax = landData.AABBMax; |
2705 | updatePacket.ParcelData.AABBMin = landData.AABBMin; | 2705 | updatePacket.ParcelData.AABBMin = landData.AABBMin; |
2706 | updatePacket.ParcelData.Area = landData.area; | 2706 | updatePacket.ParcelData.Area = landData.Area; |
2707 | updatePacket.ParcelData.AuctionID = landData.auctionID; | 2707 | updatePacket.ParcelData.AuctionID = landData.AuctionID; |
2708 | updatePacket.ParcelData.AuthBuyerID = landData.authBuyerID; //unemplemented | 2708 | updatePacket.ParcelData.AuthBuyerID = landData.AuthBuyerID; //unemplemented |
2709 | 2709 | ||
2710 | updatePacket.ParcelData.Bitmap = landData.landBitmapByteArray; | 2710 | updatePacket.ParcelData.Bitmap = landData.Bitmap; |
2711 | 2711 | ||
2712 | updatePacket.ParcelData.Desc = Helpers.StringToField(landData.landDesc); | 2712 | updatePacket.ParcelData.Desc = Helpers.StringToField(landData.Description); |
2713 | updatePacket.ParcelData.Category = (byte)landData.category; | 2713 | updatePacket.ParcelData.Category = (byte)landData.Category; |
2714 | updatePacket.ParcelData.ClaimDate = landData.claimDate; | 2714 | updatePacket.ParcelData.ClaimDate = landData.ClaimDate; |
2715 | updatePacket.ParcelData.ClaimPrice = landData.claimPrice; | 2715 | updatePacket.ParcelData.ClaimPrice = landData.ClaimPrice; |
2716 | updatePacket.ParcelData.GroupID = landData.groupID; | 2716 | updatePacket.ParcelData.GroupID = landData.GroupID; |
2717 | updatePacket.ParcelData.GroupPrims = landData.groupPrims; | 2717 | updatePacket.ParcelData.GroupPrims = landData.GroupPrims; |
2718 | updatePacket.ParcelData.IsGroupOwned = landData.isGroupOwned; | 2718 | updatePacket.ParcelData.IsGroupOwned = landData.IsGroupOwned; |
2719 | updatePacket.ParcelData.LandingType = (byte)landData.landingType; | 2719 | updatePacket.ParcelData.LandingType = (byte)landData.LandingType; |
2720 | updatePacket.ParcelData.LocalID = landData.localID; | 2720 | updatePacket.ParcelData.LocalID = landData.LocalID; |
2721 | if (landData.area > 0) | 2721 | if (landData.Area > 0) |
2722 | { | 2722 | { |
2723 | updatePacket.ParcelData.MaxPrims = parcelObjectCapacity; | 2723 | updatePacket.ParcelData.MaxPrims = parcelObjectCapacity; |
2724 | } | 2724 | } |
@@ -2726,20 +2726,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2726 | { | 2726 | { |
2727 | updatePacket.ParcelData.MaxPrims = 0; | 2727 | updatePacket.ParcelData.MaxPrims = 0; |
2728 | } | 2728 | } |
2729 | updatePacket.ParcelData.MediaAutoScale = landData.mediaAutoScale; | 2729 | updatePacket.ParcelData.MediaAutoScale = landData.MediaAutoScale; |
2730 | updatePacket.ParcelData.MediaID = landData.mediaID; | 2730 | updatePacket.ParcelData.MediaID = landData.MediaID; |
2731 | updatePacket.ParcelData.MediaURL = Helpers.StringToField(landData.mediaURL); | 2731 | updatePacket.ParcelData.MediaURL = Helpers.StringToField(landData.MediaURL); |
2732 | updatePacket.ParcelData.MusicURL = Helpers.StringToField(landData.musicURL); | 2732 | updatePacket.ParcelData.MusicURL = Helpers.StringToField(landData.MusicURL); |
2733 | updatePacket.ParcelData.Name = Helpers.StringToField(landData.landName); | 2733 | updatePacket.ParcelData.Name = Helpers.StringToField(landData.Name); |
2734 | updatePacket.ParcelData.OtherCleanTime = 0; //unemplemented | 2734 | updatePacket.ParcelData.OtherCleanTime = 0; //unemplemented |
2735 | updatePacket.ParcelData.OtherCount = 0; //unemplemented | 2735 | updatePacket.ParcelData.OtherCount = 0; //unemplemented |
2736 | updatePacket.ParcelData.OtherPrims = landData.otherPrims; | 2736 | updatePacket.ParcelData.OtherPrims = landData.OtherPrims; |
2737 | updatePacket.ParcelData.OwnerID = landData.ownerID; | 2737 | updatePacket.ParcelData.OwnerID = landData.OwnerID; |
2738 | updatePacket.ParcelData.OwnerPrims = landData.ownerPrims; | 2738 | updatePacket.ParcelData.OwnerPrims = landData.OwnerPrims; |
2739 | updatePacket.ParcelData.ParcelFlags = landData.landFlags; | 2739 | updatePacket.ParcelData.ParcelFlags = landData.Flags; |
2740 | updatePacket.ParcelData.ParcelPrimBonus = simObjectBonusFactor; | 2740 | updatePacket.ParcelData.ParcelPrimBonus = simObjectBonusFactor; |
2741 | updatePacket.ParcelData.PassHours = landData.passHours; | 2741 | updatePacket.ParcelData.PassHours = landData.PassHours; |
2742 | updatePacket.ParcelData.PassPrice = landData.passPrice; | 2742 | updatePacket.ParcelData.PassPrice = landData.PassPrice; |
2743 | updatePacket.ParcelData.PublicCount = 0; //unemplemented | 2743 | updatePacket.ParcelData.PublicCount = 0; //unemplemented |
2744 | 2744 | ||
2745 | updatePacket.ParcelData.RegionDenyAnonymous = ((regionFlags & (uint)Simulator.RegionFlags.DenyAnonymous) > | 2745 | updatePacket.ParcelData.RegionDenyAnonymous = ((regionFlags & (uint)Simulator.RegionFlags.DenyAnonymous) > |
@@ -2753,11 +2753,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2753 | 2753 | ||
2754 | updatePacket.ParcelData.RentPrice = 0; | 2754 | updatePacket.ParcelData.RentPrice = 0; |
2755 | updatePacket.ParcelData.RequestResult = request_result; | 2755 | updatePacket.ParcelData.RequestResult = request_result; |
2756 | updatePacket.ParcelData.SalePrice = landData.salePrice; | 2756 | updatePacket.ParcelData.SalePrice = landData.SalePrice; |
2757 | updatePacket.ParcelData.SelectedPrims = landData.selectedPrims; | 2757 | updatePacket.ParcelData.SelectedPrims = landData.SelectedPrims; |
2758 | updatePacket.ParcelData.SelfCount = 0; //unemplemented | 2758 | updatePacket.ParcelData.SelfCount = 0; //unemplemented |
2759 | updatePacket.ParcelData.SequenceID = sequence_id; | 2759 | updatePacket.ParcelData.SequenceID = sequence_id; |
2760 | if (landData.simwideArea > 0) | 2760 | if (landData.SimwideArea > 0) |
2761 | { | 2761 | { |
2762 | updatePacket.ParcelData.SimWideMaxPrims = parcelObjectCapacity; | 2762 | updatePacket.ParcelData.SimWideMaxPrims = parcelObjectCapacity; |
2763 | } | 2763 | } |
@@ -2765,14 +2765,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2765 | { | 2765 | { |
2766 | updatePacket.ParcelData.SimWideMaxPrims = 0; | 2766 | updatePacket.ParcelData.SimWideMaxPrims = 0; |
2767 | } | 2767 | } |
2768 | updatePacket.ParcelData.SimWideTotalPrims = landData.simwidePrims; | 2768 | updatePacket.ParcelData.SimWideTotalPrims = landData.SimwidePrims; |
2769 | updatePacket.ParcelData.SnapSelection = snap_selection; | 2769 | updatePacket.ParcelData.SnapSelection = snap_selection; |
2770 | updatePacket.ParcelData.SnapshotID = landData.snapshotID; | 2770 | updatePacket.ParcelData.SnapshotID = landData.SnapshotID; |
2771 | updatePacket.ParcelData.Status = (byte)landData.landStatus; | 2771 | updatePacket.ParcelData.Status = (byte)landData.Status; |
2772 | updatePacket.ParcelData.TotalPrims = landData.ownerPrims + landData.groupPrims + landData.otherPrims + | 2772 | updatePacket.ParcelData.TotalPrims = landData.OwnerPrims + landData.GroupPrims + landData.OtherPrims + |
2773 | landData.selectedPrims; | 2773 | landData.SelectedPrims; |
2774 | updatePacket.ParcelData.UserLocation = landData.userLocation; | 2774 | updatePacket.ParcelData.UserLocation = landData.UserLocation; |
2775 | updatePacket.ParcelData.UserLookAt = landData.userLookAt; | 2775 | updatePacket.ParcelData.UserLookAt = landData.UserLookAt; |
2776 | updatePacket.Header.Zerocoded = true; | 2776 | updatePacket.Header.Zerocoded = true; |
2777 | remote_client.OutPacket((Packet)updatePacket, ThrottleOutPacketType.Task); | 2777 | remote_client.OutPacket((Packet)updatePacket, ThrottleOutPacketType.Task); |
2778 | } | 2778 | } |