aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Environment/Interfaces/IMoneyModule.cs1
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs11
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
4 files changed, 17 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Interfaces/IMoneyModule.cs b/OpenSim/Region/Environment/Interfaces/IMoneyModule.cs
index de39d0f..eae6702 100644
--- a/OpenSim/Region/Environment/Interfaces/IMoneyModule.cs
+++ b/OpenSim/Region/Environment/Interfaces/IMoneyModule.cs
@@ -36,6 +36,7 @@ namespace OpenSim.Region.Environment.Interfaces
36 { 36 {
37 bool ObjectGiveMoney(LLUUID objectID, LLUUID fromID, LLUUID toID, 37 bool ObjectGiveMoney(LLUUID objectID, LLUUID fromID, LLUUID toID,
38 int amount); 38 int amount);
39 void ApplyUploadCharge(LLUUID agentID);
39 40
40 event ObjectPaid OnObjectPaid; 41 event ObjectPaid OnObjectPaid;
41 } 42 }
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
index d64afe7..1883b0a 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
@@ -182,6 +182,10 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
182 } 182 }
183 } 183 }
184 184
185 public void ApplyUploadCharge(LLUUID agentID)
186 {
187 }
188
185 public bool ObjectGiveMoney(LLUUID objectID, LLUUID fromID, LLUUID toID, int amount) 189 public bool ObjectGiveMoney(LLUUID objectID, LLUUID fromID, LLUUID toID, int amount)
186 { 190 {
187 string description = String.Format("Object {0} pays {1}", resolveObjectName(objectID), resolveAgentName(toID)); 191 string description = String.Format("Object {0} pays {1}", resolveObjectName(objectID), resolveAgentName(toID));
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;