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/Framework | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | * Adds AbortXfer to the ClientAPI mix (diff) | |
| download | opensim-SC_OLD-e9382c293936ff7faa34c5d70db97f24b1339755.zip opensim-SC_OLD-e9382c293936ff7faa34c5d70db97f24b1339755.tar.gz opensim-SC_OLD-e9382c293936ff7faa34c5d70db97f24b1339755.tar.bz2 opensim-SC_OLD-e9382c293936ff7faa34c5d70db97f24b1339755.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework')
| -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, |