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

@@ -1131,6 +1131,12 @@ namespace OpenSim.Client.MXP.ClientStack
// SL Specific, Ignore. (Remove from IClient)
}
public void SendAbortXferPacket(ulong xferID)
{
}
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, int PricePublicObjectDelete, int PriceRentLight, int PriceUpload, int TeleportMinPrice, float TeleportPriceExponent)
{
// SL Specific, Ignore. (Remove from IClient)