diff options
| author | Diva Canto | 2010-07-02 06:36:08 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-07-02 06:36:08 -0700 |
| commit | 79c1eb1e394c658bf2f0af0f1e20a9c5f8ea1b53 (patch) | |
| tree | 94689bae9d0813616dc9f487824d17d8954f0414 /OpenSim/Region/CoreModules | |
| parent | Fixes mantis #4782 (diff) | |
| parent | Clean up IMoneyModule and adjust the other modules to the changes (diff) | |
| download | opensim-SC_OLD-79c1eb1e394c658bf2f0af0f1e20a9c5f8ea1b53.zip opensim-SC_OLD-79c1eb1e394c658bf2f0af0f1e20a9c5f8ea1b53.tar.gz opensim-SC_OLD-79c1eb1e394c658bf2f0af0f1e20a9c5f8ea1b53.tar.bz2 opensim-SC_OLD-79c1eb1e394c658bf2f0af0f1e20a9c5f8ea1b53.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 7e08ecf..ae31050 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs | |||
| @@ -243,7 +243,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
| 243 | 243 | ||
| 244 | if (mm != null) | 244 | if (mm != null) |
| 245 | { | 245 | { |
| 246 | if (!mm.UploadCovered(remoteClient)) | 246 | if (!mm.UploadCovered(remoteClient, mm.UploadCharge)) |
| 247 | { | 247 | { |
| 248 | remoteClient.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false); | 248 | remoteClient.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false); |
| 249 | return; | 249 | return; |