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/Client/Sirikata/ClientStack | |
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 '')
-rw-r--r-- | OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs index b808e95..c1e281a 100644 --- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs +++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs | |||
@@ -573,7 +573,12 @@ namespace OpenSim.Client.Sirikata.ClientStack | |||
573 | throw new System.NotImplementedException(); | 573 | throw new System.NotImplementedException(); |
574 | } | 574 | } |
575 | 575 | ||
576 | public void SendTeleportLocationStart() | 576 | public void SendTeleportStart(uint flags) |
577 | { | ||
578 | throw new System.NotImplementedException(); | ||
579 | } | ||
580 | |||
581 | public void SendTeleportProgress(uint flags, string message) | ||
577 | { | 582 | { |
578 | throw new System.NotImplementedException(); | 583 | throw new System.NotImplementedException(); |
579 | } | 584 | } |