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/Agent | |
| 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/Agent')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 276e46d..75f6441 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
| @@ -1123,6 +1123,11 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
| 1123 | 1123 | ||
| 1124 | } | 1124 | } |
| 1125 | 1125 | ||
| 1126 | public void SendAbortXferPacket(ulong xferID) | ||
| 1127 | { | ||
| 1128 | |||
| 1129 | } | ||
| 1130 | |||
| 1126 | 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) | 1131 | 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) |
| 1127 | { | 1132 | { |
| 1128 | 1133 | ||