diff options
| author | Melanie | 2010-05-23 06:09:54 +0100 |
|---|---|---|
| committer | Melanie | 2010-05-23 06:09:54 +0100 |
| commit | a9dad994324122555c436a5db14ff4072fbf6c89 (patch) | |
| tree | 3b5dfbb8f6d989cff561fd304c822e7cbfc7c61a /OpenSim/Client/Sirikata | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Apply http://opensimulator.org/mantis/view.php?id=4632 (diff) | |
| download | opensim-SC-a9dad994324122555c436a5db14ff4072fbf6c89.zip opensim-SC-a9dad994324122555c436a5db14ff4072fbf6c89.tar.gz opensim-SC-a9dad994324122555c436a5db14ff4072fbf6c89.tar.bz2 opensim-SC-a9dad994324122555c436a5db14ff4072fbf6c89.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs | 4 |
1 files changed, 4 insertions, 0 deletions
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(); |