ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'avination' into careminster

Browse Source 
Conflicts:
	OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
This commit is contained in:
Melanie
2012-09-16 04:21:18 +01:00
parent db774d4292 387e59ff7f
commit 66bf1376b5
19 changed files with 578 additions and 561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@@ -101,12 +101,12 @@ namespace OpenSim.Region.Framework.Scenes
engine.StartProcessing();
}
public void AddUploadedInventoryItem(UUID agentID, InventoryItemBase item)
public void AddUploadedInventoryItem(UUID agentID, InventoryItemBase item, uint cost)
{
IMoneyModule money = RequestModuleInterface<IMoneyModule>();
if (money != null)
{
money.ApplyUploadCharge(agentID, money.UploadCharge, "Asset upload");
money.ApplyUploadCharge(agentID, (int)cost, "Asset upload");
}
AddInventoryItem(item);