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/Tests/Common | |
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/Tests/Common/Mock/TestClient.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 4984775..ebbf4ff 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -519,6 +519,11 @@ namespace OpenSim.Tests.Common.Mock | |||
519 | 519 | ||
520 | } | 520 | } |
521 | 521 | ||
522 | public void SendGenericMessage(string method, List<string> message) | ||
523 | { | ||
524 | |||
525 | } | ||
526 | |||
522 | public void SendGenericMessage(string method, List<byte[]> message) | 527 | public void SendGenericMessage(string method, List<byte[]> message) |
523 | { | 528 | { |
524 | 529 | ||