diff options
| author | Mike Rieker | 2010-07-06 02:23:10 +0000 |
|---|---|---|
| committer | Mike Rieker | 2010-07-06 02:23:10 +0000 |
| commit | 6e7f1a3ac11b889175c87f59a3c5361c704363a6 (patch) | |
| tree | 2ed5bebf54db3adc420e1510045b84b880ecb157 /OpenSim/Region/CoreModules/Agent | |
| parent | rewrote hanging llParseStringKeepNulls() (diff) | |
| parent | Undo fix is now complete. This commit repairs the special case of the root pr... (diff) | |
| download | opensim-SC-6e7f1a3ac11b889175c87f59a3c5361c704363a6.zip opensim-SC-6e7f1a3ac11b889175c87f59a3c5361c704363a6.tar.gz opensim-SC-6e7f1a3ac11b889175c87f59a3c5361c704363a6.tar.bz2 opensim-SC-6e7f1a3ac11b889175c87f59a3c5361c704363a6.tar.xz | |
Merge branch 'careminster-presence-refactor' of www.3dhosting.de:/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent')
| -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; |