aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
diff options
context:
space:
mode:
authorMelanie2009-12-09 16:57:35 +0000
committerMelanie2009-12-09 16:57:35 +0000
commit2e9890bbe6343c5811e6f21223e7f0e5cc2dab2a (patch)
treeccd2cf3ac694ae28f27d0949bc761b8c6314ef99 /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
parentMerge branch 'master' into careminster (diff)
parentLast bits and bobs to clean up the Meta7WindlightModule (diff)
downloadopensim-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/ClientStack/LindenUDP/LLClientView.cs')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 71f9b90..2b5e632 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -770,16 +770,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
770 } 770 }
771 } 771 }
772 772
773 public void SendGenericMessage(string method, List<string> message) 773 public void SendGenericMessage(string method, List<byte[]> message)
774 { 774 {
775 GenericMessagePacket gmp = new GenericMessagePacket(); 775 GenericMessagePacket gmp = new GenericMessagePacket();
776 gmp.MethodData.Method = Util.StringToBytes256(method); 776 gmp.MethodData.Method = Util.StringToBytes256(method);
777 gmp.ParamList = new GenericMessagePacket.ParamListBlock[message.Count]; 777 gmp.ParamList = new GenericMessagePacket.ParamListBlock[message.Count];
778 int i = 0; 778 int i = 0;
779 foreach (string val in message) 779 foreach (byte[] val in message)
780 { 780 {
781 gmp.ParamList[i] = new GenericMessagePacket.ParamListBlock(); 781 gmp.ParamList[i] = new GenericMessagePacket.ParamListBlock();
782 gmp.ParamList[i++].Parameter = Util.StringToBytes256(val); 782 gmp.ParamList[i++].Parameter = val;
783 } 783 }
784 OutPacket(gmp, ThrottleOutPacketType.Task); 784 OutPacket(gmp, ThrottleOutPacketType.Task);
785 } 785 }