diff options
| author | Tom Grimshaw | 2010-07-03 06:11:46 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-07-03 06:11:46 -0700 |
| commit | e4739523d3a9f19a0af385b64fb81fcd83a3a175 (patch) | |
| tree | 95a602904a1c0234725d1e4386eadeecfe34b364 /OpenSim/Framework/Capabilities/Caps.cs | |
| parent | Fix Undo! Made a lot of changes to Undo state saving; it now considers that ... (diff) | |
| parent | Now, fix the slash issue the right way. Our URLs now work like SL's (diff) | |
| download | opensim-SC-e4739523d3a9f19a0af385b64fb81fcd83a3a175.zip opensim-SC-e4739523d3a9f19a0af385b64fb81fcd83a3a175.tar.gz opensim-SC-e4739523d3a9f19a0af385b64fb81fcd83a3a175.tar.bz2 opensim-SC-e4739523d3a9f19a0af385b64fb81fcd83a3a175.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
| -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); |