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/Tests/Common | |
| 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/Tests/Common')
| -rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index fbc339a..69a152f 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
| @@ -696,6 +696,11 @@ namespace OpenSim.Tests.Common.Mock | |||
| 696 | { | 696 | { |
| 697 | } | 697 | } |
| 698 | 698 | ||
| 699 | public virtual void SendAbortXferPacket(ulong xferID) | ||
| 700 | { | ||
| 701 | |||
| 702 | } | ||
| 703 | |||
| 699 | public virtual void SendEconomyData(float EnergyEfficiency, int ObjectCapacity, int ObjectCount, int PriceEnergyUnit, | 704 | public virtual void SendEconomyData(float EnergyEfficiency, int ObjectCapacity, int ObjectCount, int PriceEnergyUnit, |
| 700 | int PriceGroupCreate, int PriceObjectClaim, float PriceObjectRent, float PriceObjectScaleFactor, | 705 | int PriceGroupCreate, int PriceObjectClaim, float PriceObjectRent, float PriceObjectScaleFactor, |
| 701 | int PriceParcelClaim, float PriceParcelClaimFactor, int PriceParcelRent, int PricePublicObjectDecay, | 706 | int PriceParcelClaim, float PriceParcelClaimFactor, int PriceParcelRent, int PricePublicObjectDecay, |