diff options
| author | Justin Clark-Casey (justincc) | 2010-04-01 23:59:00 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-04-01 23:59:00 +0100 |
| commit | e0eba26f7bd2258ec026a42e278420fa0938cea7 (patch) | |
| tree | 39ae2410374c07ff62a52af3551888746ed36c3c /OpenSim/Client | |
| parent | oops, add file missing from last commit (diff) | |
| parent | First attempt at fixing mantis #4641. It's better but there are now some issu... (diff) | |
| download | opensim-SC-e0eba26f7bd2258ec026a42e278420fa0938cea7.zip opensim-SC-e0eba26f7bd2258ec026a42e278420fa0938cea7.tar.gz opensim-SC-e0eba26f7bd2258ec026a42e278420fa0938cea7.tar.bz2 opensim-SC-e0eba26f7bd2258ec026a42e278420fa0938cea7.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Client')
| -rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index 2dec72d..17bd795 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
| @@ -930,7 +930,7 @@ namespace OpenSim.Client.MXP.ClientStack | |||
| 930 | // Need to translate to MXP somehow | 930 | // Need to translate to MXP somehow |
| 931 | } | 931 | } |
| 932 | 932 | ||
| 933 | public void SendGenericMessage(string method, List<string> message) | 933 | public void SendGenericMessage(string method, List<byte[]> message) |
| 934 | { | 934 | { |
| 935 | // Need to translate to MXP somehow | 935 | // Need to translate to MXP somehow |
| 936 | } | 936 | } |
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs index 9cb2172..4ecbaf9 100644 --- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs +++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs | |||
| @@ -503,7 +503,7 @@ namespace OpenSim.Client.Sirikata.ClientStack | |||
| 503 | throw new System.NotImplementedException(); | 503 | throw new System.NotImplementedException(); |
| 504 | } | 504 | } |
| 505 | 505 | ||
| 506 | public void SendGenericMessage(string method, List<string> message) | 506 | public void SendGenericMessage(string method, List<byte[]> message) |
| 507 | { | 507 | { |
| 508 | throw new System.NotImplementedException(); | 508 | throw new System.NotImplementedException(); |
| 509 | } | 509 | } |
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs index a427dd3..1da746a 100644 --- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs +++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | |||
| @@ -509,7 +509,7 @@ namespace OpenSim.Client.VWoHTTP.ClientStack | |||
| 509 | throw new System.NotImplementedException(); | 509 | throw new System.NotImplementedException(); |
| 510 | } | 510 | } |
| 511 | 511 | ||
| 512 | public void SendGenericMessage(string method, List<string> message) | 512 | public void SendGenericMessage(string method, List<byte[]> message) |
| 513 | { | 513 | { |
| 514 | throw new System.NotImplementedException(); | 514 | throw new System.NotImplementedException(); |
| 515 | } | 515 | } |