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/Region/OptionalModules/Agent | |
| 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-8c12f22140d2885bb79aa4e201345ae6fd45fec6.zip opensim-SC-8c12f22140d2885bb79aa4e201345ae6fd45fec6.tar.gz opensim-SC-8c12f22140d2885bb79aa4e201345ae6fd45fec6.tar.bz2 opensim-SC-8c12f22140d2885bb79aa4e201345ae6fd45fec6.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules/Agent')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index ee7aa2da..6793ef6 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
| @@ -1035,11 +1035,15 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
| 1035 | 1035 | ||
| 1036 | } | 1036 | } |
| 1037 | 1037 | ||
| 1038 | public void SendTeleportLocationStart() | 1038 | public void SendTeleportStart(uint flags) |
| 1039 | { | 1039 | { |
| 1040 | 1040 | ||
| 1041 | } | 1041 | } |
| 1042 | 1042 | ||
| 1043 | public void SendTeleportProgress(uint flags, string message) | ||
| 1044 | { | ||
| 1045 | } | ||
| 1046 | |||
| 1043 | public void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance) | 1047 | public void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance) |
| 1044 | { | 1048 | { |
| 1045 | 1049 | ||