diff options
| author | meta7 | 2010-08-18 02:53:27 -0700 |
|---|---|---|
| committer | meta7 | 2010-08-18 02:53:27 -0700 |
| commit | ca8b1e488c167e5644567cb001c9c2a6504f15f7 (patch) | |
| tree | 2a99b396dd4ccbd6c801efc0890fad1bd94b45e2 /OpenSim/Framework/IClientAPI.cs | |
| parent | Fix a nullref exception in the prioritizer (diff) | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.zip opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.gz opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.bz2 opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/IClientAPI.cs')
| -rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 07bded6..9025dda 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -1017,7 +1017,9 @@ namespace OpenSim.Framework | |||
| 1017 | uint flags, string capsURL); | 1017 | uint flags, string capsURL); |
| 1018 | 1018 | ||
| 1019 | void SendTeleportFailed(string reason); | 1019 | void SendTeleportFailed(string reason); |
| 1020 | void SendTeleportLocationStart(); | 1020 | void SendTeleportStart(uint flags); |
| 1021 | void SendTeleportProgress(uint flags, string message); | ||
| 1022 | |||
| 1021 | void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance); | 1023 | void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance); |
| 1022 | void SendPayPrice(UUID objectID, int[] payPrice); | 1024 | void SendPayPrice(UUID objectID, int[] payPrice); |
| 1023 | 1025 | ||