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/Region/Framework | |
| 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_OLD-e4739523d3a9f19a0af385b64fb81fcd83a3a175.zip opensim-SC_OLD-e4739523d3a9f19a0af385b64fb81fcd83a3a175.tar.gz opensim-SC_OLD-e4739523d3a9f19a0af385b64fb81fcd83a3a175.tar.bz2 opensim-SC_OLD-e4739523d3a9f19a0af385b64fb81fcd83a3a175.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 167e166..489b8ca 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -73,7 +73,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 73 | IMoneyModule money=RequestModuleInterface<IMoneyModule>(); | 73 | IMoneyModule money=RequestModuleInterface<IMoneyModule>(); |
| 74 | if (money != null) | 74 | if (money != null) |
| 75 | { | 75 | { |
| 76 | money.ApplyUploadCharge(agentID); | 76 | money.ApplyUploadCharge(agentID, money.UploadCharge, "Asset upload"); |
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | AddInventoryItem(agentID, item); | 79 | AddInventoryItem(agentID, item); |