mirror of
https://github.com/opensim/opensim.git
synced 2026-08-12 04:05:42 +08:00
Merge branch 'master' into careminster-presence-refactor
This commit is contained in:
@@ -1123,6 +1123,11 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
|
||||
|
||||
}
|
||||
|
||||
public void SendAbortXferPacket(ulong xferID)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public void SendEconomyData(float EnergyEfficiency, int ObjectCapacity, int ObjectCount, int PriceEnergyUnit, int PriceGroupCreate, int PriceObjectClaim, float PriceObjectRent, float PriceObjectScaleFactor, int PriceParcelClaim, float PriceParcelClaimFactor, int PriceParcelRent, int PricePublicObjectDecay, int PricePublicObjectDelete, int PriceRentLight, int PriceUpload, int TeleportMinPrice, float TeleportPriceExponent)
|
||||
{
|
||||
|
||||
|
||||
@@ -686,6 +686,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC
|
||||
|
||||
public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data)
|
||||
{
|
||||
}
|
||||
public virtual void SendAbortXferPacket(ulong xferID)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public virtual void SendEconomyData(float EnergyEfficiency, int ObjectCapacity, int ObjectCount, int PriceEnergyUnit,
|
||||
|
||||
Reference in New Issue
Block a user