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/Region/Examples/SimpleModule | |
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/Region/Examples/SimpleModule')
-rw-r--r-- | OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index 7441a60..a6e2c03 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | |||
@@ -602,6 +602,12 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
602 | { | 602 | { |
603 | } | 603 | } |
604 | 604 | ||
605 | public virtual void SendAbortXferPacket(ulong xferID) | ||
606 | { | ||
607 | |||
608 | } | ||
609 | |||
610 | |||
605 | public virtual void SendEconomyData(float EnergyEfficiency, int ObjectCapacity, int ObjectCount, int PriceEnergyUnit, | 611 | public virtual void SendEconomyData(float EnergyEfficiency, int ObjectCapacity, int ObjectCount, int PriceEnergyUnit, |
606 | int PriceGroupCreate, int PriceObjectClaim, float PriceObjectRent, float PriceObjectScaleFactor, | 612 | int PriceGroupCreate, int PriceObjectClaim, float PriceObjectRent, float PriceObjectScaleFactor, |
607 | int PriceParcelClaim, float PriceParcelClaimFactor, int PriceParcelRent, int PricePublicObjectDecay, | 613 | int PriceParcelClaim, float PriceParcelClaimFactor, int PriceParcelRent, int PricePublicObjectDecay, |