aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs11
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
2 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 4f65beb..0e19d96 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -59,6 +59,17 @@ namespace OpenSim.Region.Environment.Scenes
59 } 59 }
60 } 60 }
61 61
62 public void AddUploadedInventoryItem(LLUUID agentID, InventoryItemBase item)
63 {
64 IMoneyModule money=RequestModuleInterface<IMoneyModule>();
65 if(money != null)
66 {
67 money.ApplyUploadCharge(agentID);
68 }
69
70 AddInventoryItem(agentID, item);
71 }
72
62 /// <summary> 73 /// <summary>
63 /// Add an inventory item to an avatar's inventory. 74 /// Add an inventory item to an avatar's inventory.
64 /// </summary> 75 /// </summary>
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index ee634d3..774ddfc 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2092,7 +2092,7 @@ namespace OpenSim.Region.Environment.Scenes
2092 2092
2093 EventManager.TriggerOnRegisterCaps(agentId, cap); 2093 EventManager.TriggerOnRegisterCaps(agentId, cap);
2094 2094
2095 cap.AddNewInventoryItem = AddInventoryItem; 2095 cap.AddNewInventoryItem = AddUploadedInventoryItem;
2096 cap.ItemUpdatedCall = CapsUpdateInventoryItemAsset; 2096 cap.ItemUpdatedCall = CapsUpdateInventoryItemAsset;
2097 cap.TaskScriptUpdatedCall = CapsUpdateTaskInventoryScriptAsset; 2097 cap.TaskScriptUpdatedCall = CapsUpdateTaskInventoryScriptAsset;
2098 cap.CAPSFetchInventoryDescendents = CommsManager.UserProfileCacheService.HandleFetchInventoryDescendentsCAPS; 2098 cap.CAPSFetchInventoryDescendents = CommsManager.UserProfileCacheService.HandleFetchInventoryDescendentsCAPS;