diff options
author | Melanie | 2010-12-21 23:09:12 +0000 |
---|---|---|
committer | Melanie | 2010-12-21 23:09:12 +0000 |
commit | e9382c293936ff7faa34c5d70db97f24b1339755 (patch) | |
tree | 944d15d068d33f0a63110b62fe4f0e598dec3355 /OpenSim/Region/ClientStack/LindenUDP | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | * Adds AbortXfer to the ClientAPI mix (diff) | |
download | opensim-SC-e9382c293936ff7faa34c5d70db97f24b1339755.zip opensim-SC-e9382c293936ff7faa34c5d70db97f24b1339755.tar.gz opensim-SC-e9382c293936ff7faa34c5d70db97f24b1339755.tar.bz2 opensim-SC-e9382c293936ff7faa34c5d70db97f24b1339755.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 00a605e..6a6bd12 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -2097,6 +2097,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2097 | OutPacket(sendXfer, ThrottleOutPacketType.Asset); | 2097 | OutPacket(sendXfer, ThrottleOutPacketType.Asset); |
2098 | } | 2098 | } |
2099 | 2099 | ||
2100 | public void SendAbortXferPacket(ulong xferID) | ||
2101 | { | ||
2102 | AbortXferPacket xferItem = (AbortXferPacket)PacketPool.Instance.GetPacket(PacketType.AbortXfer); | ||
2103 | xferItem.XferID.ID = xferID; | ||
2104 | OutPacket(xferItem, ThrottleOutPacketType.Asset); | ||
2105 | } | ||
2106 | |||
2100 | public void SendEconomyData(float EnergyEfficiency, int ObjectCapacity, int ObjectCount, int PriceEnergyUnit, | 2107 | public void SendEconomyData(float EnergyEfficiency, int ObjectCapacity, int ObjectCount, int PriceEnergyUnit, |
2101 | int PriceGroupCreate, int PriceObjectClaim, float PriceObjectRent, float PriceObjectScaleFactor, | 2108 | int PriceGroupCreate, int PriceObjectClaim, float PriceObjectRent, float PriceObjectScaleFactor, |
2102 | int PriceParcelClaim, float PriceParcelClaimFactor, int PriceParcelRent, int PricePublicObjectDecay, | 2109 | int PriceParcelClaim, float PriceParcelClaimFactor, int PriceParcelRent, int PricePublicObjectDecay, |