aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-08-18 23:15:25 +0100
committerJustin Clark-Casey (justincc)2010-08-18 23:15:25 +0100
commit8c12f22140d2885bb79aa4e201345ae6fd45fec6 (patch)
treee6d3fd25eafdee7f790f54d092e8494be4715149 /OpenSim/Tests/Common
parentAdd textures no longer shipped with newer viewers to OpenSim's standard asset... (diff)
parentPrevent a bad cast in llCreateLink(). (diff)
downloadopensim-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/Tests/Common')
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 999cf5e..e46f9b7 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -614,7 +614,11 @@ namespace OpenSim.Tests.Common.Mock
614 { 614 {
615 } 615 }
616 616
617 public virtual void SendTeleportLocationStart() 617 public virtual void SendTeleportStart(uint flags)
618 {
619 }
620
621 public void SendTeleportProgress(uint flags, string message)
618 { 622 {
619 } 623 }
620 624