aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie2013-05-25 02:08:54 +0100
committerMelanie2013-05-25 02:08:54 +0100
commit533bbf033df88fd231eb0e7d2b0aa5a0058163ea (patch)
tree31d4c19218b254faea81da0338085691e3580260 /OpenSim/Framework
parentMeshmerizer: remember to add the copied hull verts to the list of hulls. (diff)
downloadopensim-SC_OLD-533bbf033df88fd231eb0e7d2b0aa5a0058163ea.zip
opensim-SC_OLD-533bbf033df88fd231eb0e7d2b0aa5a0058163ea.tar.gz
opensim-SC_OLD-533bbf033df88fd231eb0e7d2b0aa5a0058163ea.tar.bz2
opensim-SC_OLD-533bbf033df88fd231eb0e7d2b0aa5a0058163ea.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 1fffeff..65f8395 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1159,7 +1159,8 @@ namespace OpenSim.Framework
1159 void SendTeleportStart(uint flags); 1159 void SendTeleportStart(uint flags);
1160 void SendTeleportProgress(uint flags, string message); 1160 void SendTeleportProgress(uint flags, string message);
1161 1161
1162 void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance); 1162 void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance, int transactionType, UUID sourceID, bool sourceIsGroup, UUID destID, bool destIsGroup, int amount, string item);
1163
1163 void SendPayPrice(UUID objectID, int[] payPrice); 1164 void SendPayPrice(UUID objectID, int[] payPrice);
1164 1165
1165 void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations); 1166 void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations);
@@ -1254,8 +1255,6 @@ namespace OpenSim.Framework
1254 void SendDialog(string objectname, UUID objectID, UUID ownerID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, 1255 void SendDialog(string objectname, UUID objectID, UUID ownerID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch,
1255 string[] buttonlabels); 1256 string[] buttonlabels);
1256 1257
1257 bool AddMoney(int debit);
1258
1259 /// <summary> 1258 /// <summary>
1260 /// Update the client as to where the sun is currently located. 1259 /// Update the client as to where the sun is currently located.
1261 /// </summary> 1260 /// </summary>
diff --git a/OpenSim/Framework/IMoneyModule.cs b/OpenSim/Framework/IMoneyModule.cs
index 1e09728..52f3e83 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 44
44 int UploadCharge { get; } 45 int UploadCharge { get; }