diff options
| author | Justin Clark-Casey (justincc) | 2012-01-28 00:44:11 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-01-28 00:44:11 +0000 |
| commit | e391d6390c3249ff6a509ebdc99e3037a850dada (patch) | |
| tree | d419f1a29c80b1da48c58aa8766a37c41fb24279 /OpenSim/Region/CoreModules | |
| parent | Comment out xfer section in Scene.UpdateTaskInventory() which was causing spu... (diff) | |
| parent | Remove IClientAPI from the money module. It was only used to pass in the (diff) | |
| download | opensim-SC-e391d6390c3249ff6a509ebdc99e3037a850dada.zip opensim-SC-e391d6390c3249ff6a509ebdc99e3037a850dada.tar.gz opensim-SC-e391d6390c3249ff6a509ebdc99e3037a850dada.tar.bz2 opensim-SC-e391d6390c3249ff6a509ebdc99e3037a850dada.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -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; |