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

@@ -1062,6 +1062,8 @@ namespace OpenSim.Framework
void SendXferPacket(ulong xferID, uint packet, byte[] data);
void SendAbortXferPacket(ulong xferID);
void SendEconomyData(float EnergyEfficiency, int ObjectCapacity, int ObjectCount, int PriceEnergyUnit,
int PriceGroupCreate, int PriceObjectClaim, float PriceObjectRent,
float PriceObjectScaleFactor,