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/Framework | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Apply http://opensimulator.org/mantis/view.php?id=4632 (diff) | |
| download | opensim-SC_OLD-a9dad994324122555c436a5db14ff4072fbf6c89.zip opensim-SC_OLD-a9dad994324122555c436a5db14ff4072fbf6c89.tar.gz opensim-SC_OLD-a9dad994324122555c436a5db14ff4072fbf6c89.tar.bz2 opensim-SC_OLD-a9dad994324122555c436a5db14ff4072fbf6c89.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Framework')
| -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); |