aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client/MXP
diff options
context:
space:
mode:
authorMelanie2010-12-21 23:09:12 +0000
committerMelanie2010-12-21 23:09:12 +0000
commite9382c293936ff7faa34c5d70db97f24b1339755 (patch)
tree944d15d068d33f0a63110b62fe4f0e598dec3355 /OpenSim/Client/MXP
parentMerge branch 'master' into careminster-presence-refactor (diff)
parent* Adds AbortXfer to the ClientAPI mix (diff)
downloadopensim-SC-e9382c293936ff7faa34c5d70db97f24b1339755.zip
opensim-SC-e9382c293936ff7faa34c5d70db97f24b1339755.tar.gz
opensim-SC-e9382c293936ff7faa34c5d70db97f24b1339755.tar.bz2
opensim-SC-e9382c293936ff7faa34c5d70db97f24b1339755.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Client/MXP')
-rw-r--r--OpenSim/Client/MXP/ClientStack/MXPClientView.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index 06110c3..1f6dc5f 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -1131,6 +1131,12 @@ namespace OpenSim.Client.MXP.ClientStack
1131 // SL Specific, Ignore. (Remove from IClient) 1131 // SL Specific, Ignore. (Remove from IClient)
1132 } 1132 }
1133 1133
1134 public void SendAbortXferPacket(ulong xferID)
1135 {
1136
1137 }
1138
1139
1134 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) 1140 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)
1135 { 1141 {
1136 // SL Specific, Ignore. (Remove from IClient) 1142 // SL Specific, Ignore. (Remove from IClient)