diff options
| author | Diva Canto | 2010-05-23 12:23:16 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-05-23 12:23:16 -0700 |
| commit | 30e94cd0753809094b9b01b664e0ae643db28492 (patch) | |
| tree | 4a76c17218f68ff6aeeb43524b3298b2107e74fc /OpenSim/Client | |
| parent | The 8th migration statement in AssetStore.migrations didn't look right. (diff) | |
| parent | Remove an unneeded conditional (diff) | |
| download | opensim-SC-30e94cd0753809094b9b01b664e0ae643db28492.zip opensim-SC-30e94cd0753809094b9b01b664e0ae643db28492.tar.gz opensim-SC-30e94cd0753809094b9b01b664e0ae643db28492.tar.bz2 opensim-SC-30e94cd0753809094b9b01b664e0ae643db28492.tar.xz | |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Client')
| -rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index 3e92658..d742039 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
| @@ -931,6 +931,10 @@ namespace OpenSim.Client.MXP.ClientStack | |||
| 931 | // Need to translate to MXP somehow | 931 | // Need to translate to MXP somehow |
| 932 | } | 932 | } |
| 933 | 933 | ||
| 934 | public void SendGenericMessage(string method, List<string> message) | ||
| 935 | { | ||
| 936 | } | ||
| 937 | |||
| 934 | public void SendGenericMessage(string method, List<byte[]> message) | 938 | public void SendGenericMessage(string method, List<byte[]> message) |
| 935 | { | 939 | { |
| 936 | // Need to translate to MXP somehow | 940 | // Need to translate to MXP somehow |
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs index c293480..d725943 100644 --- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs +++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs | |||
| @@ -504,6 +504,10 @@ namespace OpenSim.Client.Sirikata.ClientStack | |||
| 504 | throw new System.NotImplementedException(); | 504 | throw new System.NotImplementedException(); |
| 505 | } | 505 | } |
| 506 | 506 | ||
| 507 | public void SendGenericMessage(string method, List<string> message) | ||
| 508 | { | ||
| 509 | } | ||
| 510 | |||
| 507 | public void SendGenericMessage(string method, List<byte[]> message) | 511 | public void SendGenericMessage(string method, List<byte[]> message) |
| 508 | { | 512 | { |
| 509 | throw new System.NotImplementedException(); | 513 | throw new System.NotImplementedException(); |
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs index 51026ab..2eec844 100644 --- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs +++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | |||
| @@ -510,6 +510,10 @@ namespace OpenSim.Client.VWoHTTP.ClientStack | |||
| 510 | throw new System.NotImplementedException(); | 510 | throw new System.NotImplementedException(); |
| 511 | } | 511 | } |
| 512 | 512 | ||
| 513 | public void SendGenericMessage(string method, List<string> message) | ||
| 514 | { | ||
| 515 | } | ||
| 516 | |||
| 513 | public void SendGenericMessage(string method, List<byte[]> message) | 517 | public void SendGenericMessage(string method, List<byte[]> message) |
| 514 | { | 518 | { |
| 515 | throw new System.NotImplementedException(); | 519 | throw new System.NotImplementedException(); |