diff options
author | Melanie | 2013-04-22 22:24:41 +0200 |
---|---|---|
committer | Melanie | 2013-04-22 22:24:41 +0200 |
commit | 6571e7ead276027e5ed86cb1fc9d1b47ddae2e6e (patch) | |
tree | 986f71620296262eb0b455d59721586c66315603 | |
parent | Add the set object owner floater template (diff) | |
download | opensim-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
6 files changed, 22 insertions, 12 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 0465042..655ba8a 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -1129,8 +1129,8 @@ namespace OpenSim.Framework | |||
1129 | 1129 | ||
1130 | void SendInstantMessage(GridInstantMessage im); | 1130 | void SendInstantMessage(GridInstantMessage im); |
1131 | 1131 | ||
1132 | void SendGenericMessage(string method, List<string> message); | 1132 | void SendGenericMessage(string method, UUID invoice, List<string> message); |
1133 | void SendGenericMessage(string method, List<byte[]> message); | 1133 | void SendGenericMessage(string method, UUID invoice, List<byte[]> message); |
1134 | 1134 | ||
1135 | void SendLayerData(float[] map); | 1135 | void SendLayerData(float[] map); |
1136 | void SendLayerData(int px, int py, float[] map); | 1136 | void SendLayerData(int px, int py, float[] map); |
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; |
diff --git a/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs b/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs index 6f92ef6..f13d648 100644 --- a/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs +++ b/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs | |||
@@ -198,12 +198,12 @@ namespace OpenSim.Region.CoreModules.World.LightShare | |||
198 | if (m_scene.RegionInfo.WindlightSettings.valid) | 198 | if (m_scene.RegionInfo.WindlightSettings.valid) |
199 | { | 199 | { |
200 | List<byte[]> param = compileWindlightSettings(wl); | 200 | List<byte[]> param = compileWindlightSettings(wl); |
201 | client.SendGenericMessage("Windlight", param); | 201 | client.SendGenericMessage("Windlight", UUID.Random(), param); |
202 | } | 202 | } |
203 | else | 203 | else |
204 | { | 204 | { |
205 | List<byte[]> param = new List<byte[]>(); | 205 | List<byte[]> param = new List<byte[]>(); |
206 | client.SendGenericMessage("WindlightReset", param); | 206 | client.SendGenericMessage("WindlightReset", UUID.Random(), param); |
207 | } | 207 | } |
208 | } | 208 | } |
209 | } | 209 | } |
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 5ac4e27..686c605 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
@@ -976,12 +976,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
976 | // TODO | 976 | // TODO |
977 | } | 977 | } |
978 | 978 | ||
979 | public void SendGenericMessage(string method, List<string> message) | 979 | public void SendGenericMessage(string method, UUID invoice, List<string> message) |
980 | { | 980 | { |
981 | 981 | ||
982 | } | 982 | } |
983 | 983 | ||
984 | public void SendGenericMessage(string method, List<byte[]> message) | 984 | public void SendGenericMessage(string method, UUID invoice, List<byte[]> message) |
985 | { | 985 | { |
986 | 986 | ||
987 | } | 987 | } |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index d665126..7918c22 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -630,12 +630,12 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
630 | 630 | ||
631 | } | 631 | } |
632 | 632 | ||
633 | public void SendGenericMessage(string method, List<string> message) | 633 | public void SendGenericMessage(string method, UUID invoice, List<string> message) |
634 | { | 634 | { |
635 | 635 | ||
636 | } | 636 | } |
637 | 637 | ||
638 | public void SendGenericMessage(string method, List<byte[]> message) | 638 | public void SendGenericMessage(string method, UUID invoice, List<byte[]> message) |
639 | { | 639 | { |
640 | 640 | ||
641 | } | 641 | } |
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 4a1380d..07de06c 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -550,12 +550,12 @@ namespace OpenSim.Tests.Common.Mock | |||
550 | 550 | ||
551 | } | 551 | } |
552 | 552 | ||
553 | public void SendGenericMessage(string method, List<string> message) | 553 | public void SendGenericMessage(string method, UUID invoice, List<string> message) |
554 | { | 554 | { |
555 | 555 | ||
556 | } | 556 | } |
557 | 557 | ||
558 | public void SendGenericMessage(string method, List<byte[]> message) | 558 | public void SendGenericMessage(string method, UUID invoice, List<byte[]> message) |
559 | { | 559 | { |
560 | 560 | ||
561 | } | 561 | } |