diff options
| author | Melanie | 2012-09-16 04:21:18 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-16 04:21:18 +0100 |
| commit | 66bf1376b5f9a0c9b5a3bdb58ac7eca09b6389ba (patch) | |
| tree | f5ce10e917fa3ab24ed98cc10ca5a87057da71a9 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Revamp the HTTP textures handler to allow a maximum of four fetches (diff) | |
| download | opensim-SC-66bf1376b5f9a0c9b5a3bdb58ac7eca09b6389ba.zip opensim-SC-66bf1376b5f9a0c9b5a3bdb58ac7eca09b6389ba.tar.gz opensim-SC-66bf1376b5f9a0c9b5a3bdb58ac7eca09b6389ba.tar.bz2 opensim-SC-66bf1376b5f9a0c9b5a3bdb58ac7eca09b6389ba.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 863aa49..3d68081 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -101,12 +101,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 101 | engine.StartProcessing(); | 101 | engine.StartProcessing(); |
| 102 | } | 102 | } |
| 103 | 103 | ||
| 104 | public void AddUploadedInventoryItem(UUID agentID, InventoryItemBase item) | 104 | public void AddUploadedInventoryItem(UUID agentID, InventoryItemBase item, uint cost) |
| 105 | { | 105 | { |
| 106 | IMoneyModule money = RequestModuleInterface<IMoneyModule>(); | 106 | IMoneyModule money = RequestModuleInterface<IMoneyModule>(); |
| 107 | if (money != null) | 107 | if (money != null) |
| 108 | { | 108 | { |
| 109 | money.ApplyUploadCharge(agentID, money.UploadCharge, "Asset upload"); | 109 | money.ApplyUploadCharge(agentID, (int)cost, "Asset upload"); |
| 110 | } | 110 | } |
| 111 | 111 | ||
| 112 | AddInventoryItem(item); | 112 | AddInventoryItem(item); |