aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client
diff options
context:
space:
mode:
authorMelanie2009-12-29 18:42:30 +0000
committerMelanie2009-12-29 18:42:30 +0000
commitba3dfe4121b6276f4afa0d5f489e04fb2e612d28 (patch)
tree83cee51a40e76442f9bbc4d130a01eb208d1554c /OpenSim/Client
parentMerge branch 'master' into careminster (diff)
parentFix up the new Sirikata cient view (diff)
downloadopensim-SC_OLD-ba3dfe4121b6276f4afa0d5f489e04fb2e612d28.zip
opensim-SC_OLD-ba3dfe4121b6276f4afa0d5f489e04fb2e612d28.tar.gz
opensim-SC_OLD-ba3dfe4121b6276f4afa0d5f489e04fb2e612d28.tar.bz2
opensim-SC_OLD-ba3dfe4121b6276f4afa0d5f489e04fb2e612d28.tar.xz
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
Diffstat (limited to 'OpenSim/Client')
-rw-r--r--OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
index e8d1889..4700bf2 100644
--- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
+++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
@@ -449,7 +449,7 @@ namespace OpenSim.Client.Sirikata.ClientStack
449 throw new System.NotImplementedException(); 449 throw new System.NotImplementedException();
450 } 450 }
451 451
452 public void SendGenericMessage(string method, List<string> message) 452 public void SendGenericMessage(string method, List<Byte[]> message)
453 { 453 {
454 throw new System.NotImplementedException(); 454 throw new System.NotImplementedException();
455 } 455 }