aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMikko Pallari2010-04-15 08:23:51 +0300
committerJustin Clark-Casey (justincc)2010-05-21 23:08:07 +0100
commit4e45718833f72b9149aed6d503e967b8916e5d08 (patch)
treeb82874cf9b54220308aabaf177adbd5b2f99ee9a
parentMerge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff)
downloadopensim-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.
-rw-r--r--OpenSim/Client/MXP/ClientStack/MXPClientView.cs4
-rw-r--r--OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs4
-rw-r--r--OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs4
-rw-r--r--OpenSim/Framework/IClientAPI.cs1
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs15
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs4
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs5
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs5
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs5
9 files changed, 47 insertions, 0 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index 3e92658..d742039 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -931,6 +931,10 @@ namespace OpenSim.Client.MXP.ClientStack
931 // Need to translate to MXP somehow 931 // Need to translate to MXP somehow
932 } 932 }
933 933
934 public void SendGenericMessage(string method, List<string> message)
935 {
936 }
937
934 public void SendGenericMessage(string method, List<byte[]> message) 938 public void SendGenericMessage(string method, List<byte[]> message)
935 { 939 {
936 // Need to translate to MXP somehow 940 // Need to translate to MXP somehow
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
index c293480..d725943 100644
--- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
+++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
@@ -504,6 +504,10 @@ namespace OpenSim.Client.Sirikata.ClientStack
504 throw new System.NotImplementedException(); 504 throw new System.NotImplementedException();
505 } 505 }
506 506
507 public void SendGenericMessage(string method, List<string> message)
508 {
509 }
510
507 public void SendGenericMessage(string method, List<byte[]> message) 511 public void SendGenericMessage(string method, List<byte[]> message)
508 { 512 {
509 throw new System.NotImplementedException(); 513 throw new System.NotImplementedException();
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
index 51026ab..2eec844 100644
--- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
+++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
@@ -510,6 +510,10 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
510 throw new System.NotImplementedException(); 510 throw new System.NotImplementedException();
511 } 511 }
512 512
513 public void SendGenericMessage(string method, List<string> message)
514 {
515 }
516
513 public void SendGenericMessage(string method, List<byte[]> message) 517 public void SendGenericMessage(string method, List<byte[]> message)
514 { 518 {
515 throw new System.NotImplementedException(); 519 throw new System.NotImplementedException();
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index f51bf71..c1333fc 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -983,6 +983,7 @@ namespace OpenSim.Framework
983 983
984 void SendInstantMessage(GridInstantMessage im); 984 void SendInstantMessage(GridInstantMessage im);
985 985
986 void SendGenericMessage(string method, List<string> message);
986 void SendGenericMessage(string method, List<byte[]> message); 987 void SendGenericMessage(string method, List<byte[]> message);
987 988
988 void SendLayerData(float[] map); 989 void SendLayerData(float[] map);
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
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 6b0efe9..94d9d72 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -519,6 +519,11 @@ namespace OpenSim.Tests.Common.Mock
519 519
520 } 520 }
521 521
522 public void SendGenericMessage(string method, List<string> message)
523 {
524
525 }
526
522 public void SendGenericMessage(string method, List<byte[]> message) 527 public void SendGenericMessage(string method, List<byte[]> message)
523 { 528 {
524 529