diff options
author | Mike Rieker | 2010-05-27 21:31:10 -0400 |
---|---|---|
committer | Mike Rieker | 2010-05-27 21:31:10 -0400 |
commit | 9ea42fdfab2ac99e24b386d67a08cf0024230f54 (patch) | |
tree | fdefa445346d03ad2d73b62687ffae4e3b635ba9 /OpenSim/Framework | |
parent | fix hanging output throttle arithmetic (diff) | |
parent | Prevent a null ref (diff) | |
download | opensim-SC-9ea42fdfab2ac99e24b386d67a08cf0024230f54.zip opensim-SC-9ea42fdfab2ac99e24b386d67a08cf0024230f54.tar.gz opensim-SC-9ea42fdfab2ac99e24b386d67a08cf0024230f54.tar.bz2 opensim-SC-9ea42fdfab2ac99e24b386d67a08cf0024230f54.tar.xz |
Merge branch 'careminster-presence-refactor' of www.3dhosting.de:/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 96223ff..71174d2 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -985,6 +985,7 @@ namespace OpenSim.Framework | |||
985 | 985 | ||
986 | void SendInstantMessage(GridInstantMessage im); | 986 | void SendInstantMessage(GridInstantMessage im); |
987 | 987 | ||
988 | void SendGenericMessage(string method, List<string> message); | ||
988 | void SendGenericMessage(string method, List<byte[]> message); | 989 | void SendGenericMessage(string method, List<byte[]> message); |
989 | 990 | ||
990 | void SendLayerData(float[] map); | 991 | void SendLayerData(float[] map); |