Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-12-21 23:09:12 +00:00
9 changed files with 106 additions and 4 deletions

View File

@@ -2097,6 +2097,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
OutPacket(sendXfer, ThrottleOutPacketType.Asset);
}
public void SendAbortXferPacket(ulong xferID)
{
AbortXferPacket xferItem = (AbortXferPacket)PacketPool.Instance.GetPacket(PacketType.AbortXfer);
xferItem.XferID.ID = xferID;
OutPacket(xferItem, ThrottleOutPacketType.Asset);
}
public void SendEconomyData(float EnergyEfficiency, int ObjectCapacity, int ObjectCount, int PriceEnergyUnit,
int PriceGroupCreate, int PriceObjectClaim, float PriceObjectRent, float PriceObjectScaleFactor,
int PriceParcelClaim, float PriceParcelClaimFactor, int PriceParcelRent, int PricePublicObjectDecay,