diff options
author | Melanie | 2013-05-30 21:48:09 +0100 |
---|---|---|
committer | Melanie | 2013-05-30 21:48:09 +0100 |
commit | 669fa3ff9ab911dc7ee686b47e49a65f67a0a809 (patch) | |
tree | 6ea7f58cc6365595281f823f3994d2d22299ee40 /OpenSim/Framework/IClientAPI.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Try caching the user name for a new agent earlier on in the process of establ... (diff) | |
download | opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.zip opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.gz opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.bz2 opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
Diffstat (limited to 'OpenSim/Framework/IClientAPI.cs')
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 34c240a..6c9e7c9 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -1171,7 +1171,8 @@ namespace OpenSim.Framework | |||
1171 | void SendTeleportStart(uint flags); | 1171 | void SendTeleportStart(uint flags); |
1172 | void SendTeleportProgress(uint flags, string message); | 1172 | void SendTeleportProgress(uint flags, string message); |
1173 | 1173 | ||
1174 | void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance); | 1174 | void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance, int transactionType, UUID sourceID, bool sourceIsGroup, UUID destID, bool destIsGroup, int amount, string item); |
1175 | |||
1175 | void SendPayPrice(UUID objectID, int[] payPrice); | 1176 | void SendPayPrice(UUID objectID, int[] payPrice); |
1176 | 1177 | ||
1177 | void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations); | 1178 | void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations); |
@@ -1269,8 +1270,6 @@ namespace OpenSim.Framework | |||
1269 | void SendDialog(string objectname, UUID objectID, UUID ownerID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, | 1270 | void SendDialog(string objectname, UUID objectID, UUID ownerID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, |
1270 | string[] buttonlabels); | 1271 | string[] buttonlabels); |
1271 | 1272 | ||
1272 | bool AddMoney(int debit); | ||
1273 | |||
1274 | /// <summary> | 1273 | /// <summary> |
1275 | /// Update the client as to where the sun is currently located. | 1274 | /// Update the client as to where the sun is currently located. |
1276 | /// </summary> | 1275 | /// </summary> |