diff options
| author | Melanie | 2009-12-09 16:57:35 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-09 16:57:35 +0000 |
| commit | 2e9890bbe6343c5811e6f21223e7f0e5cc2dab2a (patch) | |
| tree | ccd2cf3ac694ae28f27d0949bc761b8c6314ef99 /OpenSim/Region/OptionalModules | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Last bits and bobs to clean up the Meta7WindlightModule (diff) | |
| download | opensim-SC_OLD-2e9890bbe6343c5811e6f21223e7f0e5cc2dab2a.zip opensim-SC_OLD-2e9890bbe6343c5811e6f21223e7f0e5cc2dab2a.tar.gz opensim-SC_OLD-2e9890bbe6343c5811e6f21223e7f0e5cc2dab2a.tar.bz2 opensim-SC_OLD-2e9890bbe6343c5811e6f21223e7f0e5cc2dab2a.tar.xz | |
Merge branch 'careminster' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -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 6c3e7eb..bdf1574 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
| @@ -936,7 +936,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
| 936 | // TODO | 936 | // TODO |
| 937 | } | 937 | } |
| 938 | 938 | ||
| 939 | public void SendGenericMessage(string method, List<string> message) | 939 | public void SendGenericMessage(string method, List<byte[]> message) |
| 940 | { | 940 | { |
| 941 | 941 | ||
| 942 | } | 942 | } |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index cf36d08..975033a 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
| @@ -522,7 +522,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 522 | 522 | ||
| 523 | } | 523 | } |
| 524 | 524 | ||
| 525 | public void SendGenericMessage(string method, List<string> message) | 525 | public void SendGenericMessage(string method, List<byte[]> message) |
| 526 | { | 526 | { |
| 527 | 527 | ||
| 528 | } | 528 | } |