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/Framework/Capabilities/Caps.cs | |
| 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/Framework/Capabilities/Caps.cs')
| -rw-r--r-- | OpenSim/Framework/Capabilities/Caps.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs index 62a1e17..da953bb 100644 --- a/OpenSim/Framework/Capabilities/Caps.cs +++ b/OpenSim/Framework/Capabilities/Caps.cs | |||
| @@ -814,7 +814,7 @@ namespace OpenSim.Framework.Capabilities | |||
| 814 | 814 | ||
| 815 | if (mm != null) | 815 | if (mm != null) |
| 816 | { | 816 | { |
| 817 | if (!mm.UploadCovered(client)) | 817 | if (!mm.UploadCovered(client, mm.UploadCharge)) |
| 818 | { | 818 | { |
| 819 | if (client != null) | 819 | if (client != null) |
| 820 | client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false); | 820 | client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false); |