diff options
| author | Melanie | 2012-01-28 01:01:23 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-28 01:01:23 +0000 |
| commit | 428407c5e409f0734ce909d5db9b1114a92cba35 (patch) | |
| tree | b1fc56efd4d8f9251811bfdb3df434534787b1c8 /OpenSim/Region/CoreModules | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove IClientAPI from the money module. It was only used to pass in the (diff) | |
| download | opensim-SC_OLD-428407c5e409f0734ce909d5db9b1114a92cba35.zip opensim-SC_OLD-428407c5e409f0734ce909d5db9b1114a92cba35.tar.gz opensim-SC_OLD-428407c5e409f0734ce909d5db9b1114a92cba35.tar.bz2 opensim-SC_OLD-428407c5e409f0734ce909d5db9b1114a92cba35.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs index a28d5d7..95e3aec 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs | |||
| @@ -246,7 +246,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
| 246 | 246 | ||
| 247 | if (mm != null) | 247 | if (mm != null) |
| 248 | { | 248 | { |
| 249 | if (!mm.UploadCovered(remoteClient, mm.UploadCharge)) | 249 | if (!mm.UploadCovered(remoteClient.AgentId, mm.UploadCharge)) |
| 250 | { | 250 | { |
| 251 | remoteClient.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false); | 251 | remoteClient.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false); |
| 252 | return; | 252 | return; |