aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden
diff options
context:
space:
mode:
authorMelanie2013-04-22 22:24:41 +0200
committerMelanie2013-04-22 22:24:41 +0200
commit6571e7ead276027e5ed86cb1fc9d1b47ddae2e6e (patch)
tree986f71620296262eb0b455d59721586c66315603 /OpenSim/Region/ClientStack/Linden
parentAdd the set object owner floater template (diff)
downloadopensim-SC_OLD-6571e7ead276027e5ed86cb1fc9d1b47ddae2e6e.zip
opensim-SC_OLD-6571e7ead276027e5ed86cb1fc9d1b47ddae2e6e.tar.gz
opensim-SC_OLD-6571e7ead276027e5ed86cb1fc9d1b47ddae2e6e.tar.bz2
opensim-SC_OLD-6571e7ead276027e5ed86cb1fc9d1b47ddae2e6e.tar.xz
Allow callers to set the invoice parameter for GenericMessage
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs14
1 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index f8b9352..4979be8 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -903,9 +903,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
903 } 903 }
904 } 904 }
905 905
906 public void SendGenericMessage(string method, List<string> message) 906 public void SendGenericMessage(string method, UUID invoice, List<string> message)
907 { 907 {
908 GenericMessagePacket gmp = new GenericMessagePacket(); 908 GenericMessagePacket gmp = new GenericMessagePacket();
909
910 gmp.AgentData.AgentID = AgentId;
911 gmp.AgentData.SessionID = m_sessionId;
912 gmp.AgentData.TransactionID = invoice;
913
909 gmp.MethodData.Method = Util.StringToBytes256(method); 914 gmp.MethodData.Method = Util.StringToBytes256(method);
910 gmp.ParamList = new GenericMessagePacket.ParamListBlock[message.Count]; 915 gmp.ParamList = new GenericMessagePacket.ParamListBlock[message.Count];
911 int i = 0; 916 int i = 0;
@@ -918,9 +923,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
918 OutPacket(gmp, ThrottleOutPacketType.Task); 923 OutPacket(gmp, ThrottleOutPacketType.Task);
919 } 924 }
920 925
921 public void SendGenericMessage(string method, List<byte[]> message) 926 public void SendGenericMessage(string method, UUID invoice, List<byte[]> message)
922 { 927 {
923 GenericMessagePacket gmp = new GenericMessagePacket(); 928 GenericMessagePacket gmp = new GenericMessagePacket();
929
930 gmp.AgentData.AgentID = AgentId;
931 gmp.AgentData.SessionID = m_sessionId;
932 gmp.AgentData.TransactionID = invoice;
933
924 gmp.MethodData.Method = Util.StringToBytes256(method); 934 gmp.MethodData.Method = Util.StringToBytes256(method);
925 gmp.ParamList = new GenericMessagePacket.ParamListBlock[message.Count]; 935 gmp.ParamList = new GenericMessagePacket.ParamListBlock[message.Count];
926 int i = 0; 936 int i = 0;