diff options
| author | Justin Clark-Casey (justincc) | 2010-04-01 23:59:00 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-04-01 23:59:00 +0100 |
| commit | e0eba26f7bd2258ec026a42e278420fa0938cea7 (patch) | |
| tree | 39ae2410374c07ff62a52af3551888746ed36c3c /OpenSim/Region/OptionalModules | |
| parent | oops, add file missing from last commit (diff) | |
| parent | First attempt at fixing mantis #4641. It's better but there are now some issu... (diff) | |
| download | opensim-SC_OLD-e0eba26f7bd2258ec026a42e278420fa0938cea7.zip opensim-SC_OLD-e0eba26f7bd2258ec026a42e278420fa0938cea7.tar.gz opensim-SC_OLD-e0eba26f7bd2258ec026a42e278420fa0938cea7.tar.bz2 opensim-SC_OLD-e0eba26f7bd2258ec026a42e278420fa0938cea7.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 1885946..f5b148f 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
| @@ -964,7 +964,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
| 964 | // TODO | 964 | // TODO |
| 965 | } | 965 | } |
| 966 | 966 | ||
| 967 | public void SendGenericMessage(string method, List<string> message) | 967 | public void SendGenericMessage(string method, List<byte[]> message) |
| 968 | { | 968 | { |
| 969 | 969 | ||
| 970 | } | 970 | } |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 77958eb..338c04b 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
| @@ -550,7 +550,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 550 | 550 | ||
| 551 | } | 551 | } |
| 552 | 552 | ||
| 553 | public void SendGenericMessage(string method, List<string> message) | 553 | public void SendGenericMessage(string method, List<byte[]> message) |
| 554 | { | 554 | { |
| 555 | 555 | ||
| 556 | } | 556 | } |