diff options
author | Mikko Pallari | 2010-04-15 08:23:51 +0300 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-05-21 23:08:07 +0100 |
commit | 4e45718833f72b9149aed6d503e967b8916e5d08 (patch) | |
tree | b82874cf9b54220308aabaf177adbd5b2f99ee9a /OpenSim/Region | |
parent | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-4e45718833f72b9149aed6d503e967b8916e5d08.zip opensim-SC_OLD-4e45718833f72b9149aed6d503e967b8916e5d08.tar.gz opensim-SC_OLD-4e45718833f72b9149aed6d503e967b8916e5d08.tar.bz2 opensim-SC_OLD-4e45718833f72b9149aed6d503e967b8916e5d08.tar.xz |
Added overload of SendGenericMessage to LLClientView with string list as parameter. Now modules themselfs don't necessarily need to convert strings to byte arrays. Added this as it was removed in LightShare patch.
Diffstat (limited to '')
4 files changed, 29 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 9eb35fa..e67428d 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -816,6 +816,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
816 | } | 816 | } |
817 | } | 817 | } |
818 | 818 | ||
819 | public void SendGenericMessage(string method, List<string> message) | ||
820 | { | ||
821 | GenericMessagePacket gmp = new GenericMessagePacket(); | ||
822 | gmp.MethodData.Method = Util.StringToBytes256(method); | ||
823 | gmp.ParamList = new GenericMessagePacket.ParamListBlock[message.Count]; | ||
824 | int i = 0; | ||
825 | foreach (string val in message) | ||
826 | { | ||
827 | gmp.ParamList[i] = new GenericMessagePacket.ParamListBlock(); | ||
828 | gmp.ParamList[i++].Parameter = Util.StringToBytes256(val); | ||
829 | } | ||
830 | |||
831 | OutPacket(gmp, ThrottleOutPacketType.Task); | ||
832 | } | ||
833 | |||
819 | public void SendGenericMessage(string method, List<byte[]> message) | 834 | public void SendGenericMessage(string method, List<byte[]> message) |
820 | { | 835 | { |
821 | GenericMessagePacket gmp = new GenericMessagePacket(); | 836 | GenericMessagePacket gmp = new GenericMessagePacket(); |
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index 967438f..2681d4f 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | |||
@@ -461,6 +461,10 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
461 | 461 | ||
462 | } | 462 | } |
463 | 463 | ||
464 | public void SendGenericMessage(string method, List<string> message) | ||
465 | { | ||
466 | } | ||
467 | |||
464 | public void SendGenericMessage(string method, List<byte[]> message) | 468 | public void SendGenericMessage(string method, List<byte[]> message) |
465 | { | 469 | { |
466 | 470 | ||
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 27de529..7453eae 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
@@ -965,6 +965,11 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
965 | // TODO | 965 | // TODO |
966 | } | 966 | } |
967 | 967 | ||
968 | public void SendGenericMessage(string method, List<string> message) | ||
969 | { | ||
970 | |||
971 | } | ||
972 | |||
968 | public void SendGenericMessage(string method, List<byte[]> message) | 973 | public void SendGenericMessage(string method, List<byte[]> message) |
969 | { | 974 | { |
970 | 975 | ||
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index d2279c7..146b3d6 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -551,6 +551,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
551 | 551 | ||
552 | } | 552 | } |
553 | 553 | ||
554 | public void SendGenericMessage(string method, List<string> message) | ||
555 | { | ||
556 | |||
557 | } | ||
558 | |||
554 | public void SendGenericMessage(string method, List<byte[]> message) | 559 | public void SendGenericMessage(string method, List<byte[]> message) |
555 | { | 560 | { |
556 | 561 | ||