aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client/Sirikata/ClientStack
diff options
context:
space:
mode:
authormeta72010-08-18 02:53:27 -0700
committermeta72010-08-18 02:53:27 -0700
commitca8b1e488c167e5644567cb001c9c2a6504f15f7 (patch)
tree2a99b396dd4ccbd6c801efc0890fad1bd94b45e2 /OpenSim/Client/Sirikata/ClientStack
parentFix a nullref exception in the prioritizer (diff)
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-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 '')
-rw-r--r--OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
index 6ad5f5a..e36b797 100644
--- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
+++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
@@ -583,7 +583,12 @@ namespace OpenSim.Client.Sirikata.ClientStack
583 throw new System.NotImplementedException(); 583 throw new System.NotImplementedException();
584 } 584 }
585 585
586 public void SendTeleportLocationStart() 586 public void SendTeleportStart(uint flags)
587 {
588 throw new System.NotImplementedException();
589 }
590
591 public void SendTeleportProgress(uint flags, string message)
587 { 592 {
588 throw new System.NotImplementedException(); 593 throw new System.NotImplementedException();
589 } 594 }