diff options
| author | Melanie | 2010-03-31 04:38:19 +0100 |
|---|---|---|
| committer | Melanie | 2010-03-31 04:38:19 +0100 |
| commit | 4fefd05839d78dcdd108b0b216d831eb512ffd58 (patch) | |
| tree | eb9ffc6f1f96f674e796cf0f57cd6dd27b34eaa0 /OpenSim/Client/Sirikata | |
| parent | Rename Meta7Windlight to LightShare (diff) | |
| parent | Adding the LightShare module and scripting API. This code was written by (diff) | |
| download | opensim-SC-4fefd05839d78dcdd108b0b216d831eb512ffd58.zip opensim-SC-4fefd05839d78dcdd108b0b216d831eb512ffd58.tar.gz opensim-SC-4fefd05839d78dcdd108b0b216d831eb512ffd58.tar.bz2 opensim-SC-4fefd05839d78dcdd108b0b216d831eb512ffd58.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Remerge the LightShare bits that were pushed to core
Diffstat (limited to 'OpenSim/Client/Sirikata')
| -rw-r--r-- | OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs index b199b93..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<Byte[]> message) | 506 | public void SendGenericMessage(string method, List<byte[]> message) |
| 507 | { | 507 | { |
| 508 | throw new System.NotImplementedException(); | 508 | throw new System.NotImplementedException(); |
| 509 | } | 509 | } |