diff options
author | sacha | 2010-12-23 08:14:43 +0000 |
---|---|---|
committer | sacha | 2010-12-23 08:14:43 +0000 |
commit | 98f0b4c72ad208e9f664d30bb6a84e0b2adf8214 (patch) | |
tree | fdf6001af7f458fed5bf6f18df9be1882eb193d4 /OpenSim/Framework/IClientAPI.cs | |
parent | reactivating some traces to track a dead thread (diff) | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC-98f0b4c72ad208e9f664d30bb6a84e0b2adf8214.zip opensim-SC-98f0b4c72ad208e9f664d30bb6a84e0b2adf8214.tar.gz opensim-SC-98f0b4c72ad208e9f664d30bb6a84e0b2adf8214.tar.bz2 opensim-SC-98f0b4c72ad208e9f664d30bb6a84e0b2adf8214.tar.xz |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 1a59cf4..34ec420 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -1062,6 +1062,8 @@ namespace OpenSim.Framework | |||
1062 | 1062 | ||
1063 | void SendXferPacket(ulong xferID, uint packet, byte[] data); | 1063 | void SendXferPacket(ulong xferID, uint packet, byte[] data); |
1064 | 1064 | ||
1065 | void SendAbortXferPacket(ulong xferID); | ||
1066 | |||
1065 | void SendEconomyData(float EnergyEfficiency, int ObjectCapacity, int ObjectCount, int PriceEnergyUnit, | 1067 | void SendEconomyData(float EnergyEfficiency, int ObjectCapacity, int ObjectCount, int PriceEnergyUnit, |
1066 | int PriceGroupCreate, int PriceObjectClaim, float PriceObjectRent, | 1068 | int PriceGroupCreate, int PriceObjectClaim, float PriceObjectRent, |
1067 | float PriceObjectScaleFactor, | 1069 | float PriceObjectScaleFactor, |