aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie2013-05-25 01:58:50 +0200
committerMelanie2013-05-25 01:58:50 +0200
commit0086c3b5fb24f4a25fe2e28f9cedcaa41c70b36c (patch)
treea315dc4368a92f15b39d516f3a3dc5eea9eeeff8 /OpenSim/Framework
parentReset "Show in search" on parcels cut off other parcels that are in search (diff)
downloadopensim-SC_OLD-0086c3b5fb24f4a25fe2e28f9cedcaa41c70b36c.zip
opensim-SC_OLD-0086c3b5fb24f4a25fe2e28f9cedcaa41c70b36c.tar.gz
opensim-SC_OLD-0086c3b5fb24f4a25fe2e28f9cedcaa41c70b36c.tar.bz2
opensim-SC_OLD-0086c3b5fb24f4a25fe2e28f9cedcaa41c70b36c.tar.xz
Update the money framework to allow sending the new style linden "serverside is now viewerside" messages regarding currency
This will require all money modules to be refactored!
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/IClientAPI.cs5
-rw-r--r--OpenSim/Framework/IMoneyModule.cs3
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index c88828b..ad3471a 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1168,7 +1168,8 @@ namespace OpenSim.Framework
1168 void SendTeleportStart(uint flags); 1168 void SendTeleportStart(uint flags);
1169 void SendTeleportProgress(uint flags, string message); 1169 void SendTeleportProgress(uint flags, string message);
1170 1170
1171 void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance); 1171 void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance, int transactionType, UUID sourceID, bool sourceIsGroup, UUID destID, bool destIsGroup, int amount, string item);
1172
1172 void SendPayPrice(UUID objectID, int[] payPrice); 1173 void SendPayPrice(UUID objectID, int[] payPrice);
1173 1174
1174 void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations); 1175 void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations);
@@ -1266,8 +1267,6 @@ namespace OpenSim.Framework
1266 void SendDialog(string objectname, UUID objectID, UUID ownerID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, 1267 void SendDialog(string objectname, UUID objectID, UUID ownerID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch,
1267 string[] buttonlabels); 1268 string[] buttonlabels);
1268 1269
1269 bool AddMoney(int debit);
1270
1271 /// <summary> 1270 /// <summary>
1272 /// Update the client as to where the sun is currently located. 1271 /// Update the client as to where the sun is currently located.
1273 /// </summary> 1272 /// </summary>
diff --git a/OpenSim/Framework/IMoneyModule.cs b/OpenSim/Framework/IMoneyModule.cs
index 7378d2e..415b7df 100644
--- a/OpenSim/Framework/IMoneyModule.cs
+++ b/OpenSim/Framework/IMoneyModule.cs
@@ -38,7 +38,8 @@ namespace OpenSim.Framework
38 int GetBalance(UUID agentID); 38 int GetBalance(UUID agentID);
39 bool UploadCovered(UUID agentID, int amount); 39 bool UploadCovered(UUID agentID, int amount);
40 bool AmountCovered(UUID agentID, int amount); 40 bool AmountCovered(UUID agentID, int amount);
41 void ApplyCharge(UUID agentID, int amount, string text); 41 void ApplyCharge(UUID agentID, int amount, MoneyTransactionType type);
42 void ApplyCharge(UUID agentID, int amount, MoneyTransactionType type, string extraData);
42 void ApplyUploadCharge(UUID agentID, int amount, string text); 43 void ApplyUploadCharge(UUID agentID, int amount, string text);
43 void MoveMoney(UUID fromUser, UUID toUser, int amount, string text); 44 void MoveMoney(UUID fromUser, UUID toUser, int amount, string text);
44 45