diff options
| author | Justin Clark-Casey (justincc) | 2010-08-18 23:15:25 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-08-18 23:15:25 +0100 |
| commit | 8c12f22140d2885bb79aa4e201345ae6fd45fec6 (patch) | |
| tree | e6d3fd25eafdee7f790f54d092e8494be4715149 /OpenSim/Framework | |
| parent | Add textures no longer shipped with newer viewers to OpenSim's standard asset... (diff) | |
| parent | Prevent a bad cast in llCreateLink(). (diff) | |
| download | opensim-SC_OLD-8c12f22140d2885bb79aa4e201345ae6fd45fec6.zip opensim-SC_OLD-8c12f22140d2885bb79aa4e201345ae6fd45fec6.tar.gz opensim-SC_OLD-8c12f22140d2885bb79aa4e201345ae6fd45fec6.tar.bz2 opensim-SC_OLD-8c12f22140d2885bb79aa4e201345ae6fd45fec6.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
| -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 db74548..94815cd 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -1011,7 +1011,9 @@ namespace OpenSim.Framework | |||
| 1011 | uint flags, string capsURL); | 1011 | uint flags, string capsURL); |
| 1012 | 1012 | ||
| 1013 | void SendTeleportFailed(string reason); | 1013 | void SendTeleportFailed(string reason); |
| 1014 | void SendTeleportLocationStart(); | 1014 | void SendTeleportStart(uint flags); |
| 1015 | void SendTeleportProgress(uint flags, string message); | ||
| 1016 | |||
| 1015 | void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance); | 1017 | void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance); |
| 1016 | void SendPayPrice(UUID objectID, int[] payPrice); | 1018 | void SendPayPrice(UUID objectID, int[] payPrice); |
| 1017 | 1019 | ||