aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2013-04-22 22:24:41 +0200
committerMelanie2013-04-22 22:39:08 +0100
commit293a024c141d3567d42169f625bc449b89a1b59d (patch)
treef8d7064f5e2fa813ee8a15f1b6e235d3c79620db /OpenSim/Region
parentClean up unused config and config comments. (diff)
downloadopensim-SC_OLD-293a024c141d3567d42169f625bc449b89a1b59d.zip
opensim-SC_OLD-293a024c141d3567d42169f625bc449b89a1b59d.tar.gz
opensim-SC_OLD-293a024c141d3567d42169f625bc449b89a1b59d.tar.bz2
opensim-SC_OLD-293a024c141d3567d42169f625bc449b89a1b59d.tar.xz
Allow callers to set the invoice parameter for GenericMessage
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs14
-rw-r--r--OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs4
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs4
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs4
4 files changed, 18 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 1609012..1eb953c 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -900,9 +900,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
900 } 900 }
901 } 901 }
902 902
903 public void SendGenericMessage(string method, List<string> message) 903 public void SendGenericMessage(string method, UUID invoice, List<string> message)
904 { 904 {
905 GenericMessagePacket gmp = new GenericMessagePacket(); 905 GenericMessagePacket gmp = new GenericMessagePacket();
906
907 gmp.AgentData.AgentID = AgentId;
908 gmp.AgentData.SessionID = m_sessionId;
909 gmp.AgentData.TransactionID = invoice;
910
906 gmp.MethodData.Method = Util.StringToBytes256(method); 911 gmp.MethodData.Method = Util.StringToBytes256(method);
907 gmp.ParamList = new GenericMessagePacket.ParamListBlock[message.Count]; 912 gmp.ParamList = new GenericMessagePacket.ParamListBlock[message.Count];
908 int i = 0; 913 int i = 0;
@@ -915,9 +920,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
915 OutPacket(gmp, ThrottleOutPacketType.Task); 920 OutPacket(gmp, ThrottleOutPacketType.Task);
916 } 921 }
917 922
918 public void SendGenericMessage(string method, List<byte[]> message) 923 public void SendGenericMessage(string method, UUID invoice, List<byte[]> message)
919 { 924 {
920 GenericMessagePacket gmp = new GenericMessagePacket(); 925 GenericMessagePacket gmp = new GenericMessagePacket();
926
927 gmp.AgentData.AgentID = AgentId;
928 gmp.AgentData.SessionID = m_sessionId;
929 gmp.AgentData.TransactionID = invoice;
930
921 gmp.MethodData.Method = Util.StringToBytes256(method); 931 gmp.MethodData.Method = Util.StringToBytes256(method);
922 gmp.ParamList = new GenericMessagePacket.ParamListBlock[message.Count]; 932 gmp.ParamList = new GenericMessagePacket.ParamListBlock[message.Count];
923 int i = 0; 933 int i = 0;
diff --git a/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs b/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
index 4e20196..89f3280 100644
--- a/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
+++ b/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
@@ -195,12 +195,12 @@ namespace OpenSim.Region.CoreModules.World.LightShare
195 if (m_scene.RegionInfo.WindlightSettings.valid) 195 if (m_scene.RegionInfo.WindlightSettings.valid)
196 { 196 {
197 List<byte[]> param = compileWindlightSettings(wl); 197 List<byte[]> param = compileWindlightSettings(wl);
198 client.SendGenericMessage("Windlight", param); 198 client.SendGenericMessage("Windlight", UUID.Random(), param);
199 } 199 }
200 else 200 else
201 { 201 {
202 List<byte[]> param = new List<byte[]>(); 202 List<byte[]> param = new List<byte[]>();
203 client.SendGenericMessage("WindlightReset", param); 203 client.SendGenericMessage("WindlightReset", UUID.Random(), param);
204 } 204 }
205 } 205 }
206 } 206 }
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 0ac56fa..915ebd8 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -971,12 +971,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
971 // TODO 971 // TODO
972 } 972 }
973 973
974 public void SendGenericMessage(string method, List<string> message) 974 public void SendGenericMessage(string method, UUID invoice, List<string> message)
975 { 975 {
976 976
977 } 977 }
978 978
979 public void SendGenericMessage(string method, List<byte[]> message) 979 public void SendGenericMessage(string method, UUID invoice, List<byte[]> message)
980 { 980 {
981 981
982 } 982 }
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 6bd27f0..0ee00e9 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -620,12 +620,12 @@ namespace OpenSim.Region.OptionalModules.World.NPC
620 620
621 } 621 }
622 622
623 public void SendGenericMessage(string method, List<string> message) 623 public void SendGenericMessage(string method, UUID invoice, List<string> message)
624 { 624 {
625 625
626 } 626 }
627 627
628 public void SendGenericMessage(string method, List<byte[]> message) 628 public void SendGenericMessage(string method, UUID invoice, List<byte[]> message)
629 { 629 {
630 630
631 } 631 }