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/OptionalModules/World | |
| 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/OptionalModules/World')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 39c3364..51949b4 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
| @@ -687,6 +687,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 687 | public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data) | 687 | public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data) |
| 688 | { | 688 | { |
| 689 | } | 689 | } |
| 690 | public virtual void SendAbortXferPacket(ulong xferID) | ||
| 691 | { | ||
| 692 | |||
| 693 | } | ||
| 690 | 694 | ||
| 691 | public virtual void SendEconomyData(float EnergyEfficiency, int ObjectCapacity, int ObjectCount, int PriceEnergyUnit, | 695 | public virtual void SendEconomyData(float EnergyEfficiency, int ObjectCapacity, int ObjectCount, int PriceEnergyUnit, |
| 692 | int PriceGroupCreate, int PriceObjectClaim, float PriceObjectRent, float PriceObjectScaleFactor, | 696 | int PriceGroupCreate, int PriceObjectClaim, float PriceObjectRent, float PriceObjectScaleFactor, |