aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client
diff options
context:
space:
mode:
authorMike Rieker2010-05-27 21:31:10 -0400
committerMike Rieker2010-05-27 21:31:10 -0400
commit9ea42fdfab2ac99e24b386d67a08cf0024230f54 (patch)
treefdefa445346d03ad2d73b62687ffae4e3b635ba9 /OpenSim/Client
parentfix hanging output throttle arithmetic (diff)
parentPrevent a null ref (diff)
downloadopensim-SC-9ea42fdfab2ac99e24b386d67a08cf0024230f54.zip
opensim-SC-9ea42fdfab2ac99e24b386d67a08cf0024230f54.tar.gz
opensim-SC-9ea42fdfab2ac99e24b386d67a08cf0024230f54.tar.bz2
opensim-SC-9ea42fdfab2ac99e24b386d67a08cf0024230f54.tar.xz
Merge branch 'careminster-presence-refactor' of www.3dhosting.de:/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Client')
-rw-r--r--OpenSim/Client/MXP/ClientStack/MXPClientView.cs4
-rw-r--r--OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs4
-rw-r--r--OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs4
3 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index dc4de8e..30c8e4c 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -943,6 +943,10 @@ namespace OpenSim.Client.MXP.ClientStack
943 // Need to translate to MXP somehow 943 // Need to translate to MXP somehow
944 } 944 }
945 945
946 public void SendGenericMessage(string method, List<string> message)
947 {
948 }
949
946 public void SendGenericMessage(string method, List<byte[]> message) 950 public void SendGenericMessage(string method, List<byte[]> message)
947 { 951 {
948 // Need to translate to MXP somehow 952 // Need to translate to MXP somehow
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
index 3f3166a..bc48123 100644
--- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
+++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
@@ -513,6 +513,10 @@ namespace OpenSim.Client.Sirikata.ClientStack
513 throw new System.NotImplementedException(); 513 throw new System.NotImplementedException();
514 } 514 }
515 515
516 public void SendGenericMessage(string method, List<string> message)
517 {
518 }
519
516 public void SendGenericMessage(string method, List<byte[]> message) 520 public void SendGenericMessage(string method, List<byte[]> message)
517 { 521 {
518 throw new System.NotImplementedException(); 522 throw new System.NotImplementedException();
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
index 11eed09..e6d1c48 100644
--- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
+++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
@@ -519,6 +519,10 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
519 throw new System.NotImplementedException(); 519 throw new System.NotImplementedException();
520 } 520 }
521 521
522 public void SendGenericMessage(string method, List<string> message)
523 {
524 }
525
522 public void SendGenericMessage(string method, List<byte[]> message) 526 public void SendGenericMessage(string method, List<byte[]> message)
523 { 527 {
524 throw new System.NotImplementedException(); 528 throw new System.NotImplementedException();