aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2009-12-26 04:12:51 +0000
committerMelanie2009-12-26 04:12:51 +0000
commit88b3b98811e70709536bb41410ec88509e0460a5 (patch)
tree0af9d7fd8ccf40411f496ba2311cfedf19028230 /OpenSim
parentMake the GenericTableHandler work as intended (diff)
downloadopensim-SC_OLD-88b3b98811e70709536bb41410ec88509e0460a5.zip
opensim-SC_OLD-88b3b98811e70709536bb41410ec88509e0460a5.tar.gz
opensim-SC_OLD-88b3b98811e70709536bb41410ec88509e0460a5.tar.bz2
opensim-SC_OLD-88b3b98811e70709536bb41410ec88509e0460a5.tar.xz
Add AvatarInterestsReply
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Client/MXP/ClientStack/MXPClientView.cs4
-rw-r--r--OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs4
-rw-r--r--OpenSim/Framework/IClientAPI.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs17
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs4
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs4
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs4
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs5
8 files changed, 43 insertions, 1 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index 0cae3dd..0141718 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -1655,5 +1655,9 @@ namespace OpenSim.Client.MXP.ClientStack
1655 public void SendRebakeAvatarTextures(UUID textureID) 1655 public void SendRebakeAvatarTextures(UUID textureID)
1656 { 1656 {
1657 } 1657 }
1658
1659 public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
1660 {
1661 }
1658 } 1662 }
1659} 1663}
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
index fb87c15..74cecea 100644
--- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
+++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
@@ -1161,5 +1161,9 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
1161 public void SendRebakeAvatarTextures(UUID textureID) 1161 public void SendRebakeAvatarTextures(UUID textureID)
1162 { 1162 {
1163 } 1163 }
1164
1165 public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
1166 {
1167 }
1164 } 1168 }
1165} 1169}
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 04ba9c6..f83fea2 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1392,5 +1392,7 @@ namespace OpenSim.Framework
1392 bool AddGenericPacketHandler(string MethodName, GenericMessage handler); 1392 bool AddGenericPacketHandler(string MethodName, GenericMessage handler);
1393 1393
1394 void SendRebakeAvatarTextures(UUID textureID); 1394 void SendRebakeAvatarTextures(UUID textureID);
1395
1396 void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages);
1395 } 1397 }
1396} 1398}
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 4780701..f6c505a 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -15809,5 +15809,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
15809 15809
15810 return osdEvent; 15810 return osdEvent;
15811 } 15811 }
15812
15813 public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
15814 {
15815 AvatarInterestsReplyPacket packet = (AvatarInterestsReplyPacket)PacketPool.Instance.GetPacket(PacketType.AvatarInterestsReply);
15816
15817 packet.AgentData = new AvatarInterestsReplyPacket.AgentDataBlock();
15818 packet.AgentData.AgentID = AgentId;
15819 packet.AgentData.AvatarID = avatarID;
15820
15821 packet.PropertiesData = new AvatarInterestsReplyPacket.PropertiesDataBlock();
15822 packet.PropertiesData.WantToMask = wantMask;
15823 packet.PropertiesData.WantToText = Utils.StringToBytes(wantText);
15824 packet.PropertiesData.SkillsMask = skillsMask;
15825 packet.PropertiesData.SkillsText = Utils.StringToBytes(skillsText);
15826 packet.PropertiesData.LanguagesText = Utils.StringToBytes(languages);
15827 OutPacket(packet, ThrottleOutPacketType.Task);
15828 }
15812 } 15829 }
15813} 15830}
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 9754da3..89e7747 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -1099,5 +1099,9 @@ namespace OpenSim.Region.Examples.SimpleModule
1099 public void SendRebakeAvatarTextures(UUID textureID) 1099 public void SendRebakeAvatarTextures(UUID textureID)
1100 { 1100 {
1101 } 1101 }
1102
1103 public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
1104 {
1105 }
1102 } 1106 }
1103} 1107}
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 6c3e7eb..8b34396 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -1624,5 +1624,9 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1624 public void SendRebakeAvatarTextures(UUID textureID) 1624 public void SendRebakeAvatarTextures(UUID textureID)
1625 { 1625 {
1626 } 1626 }
1627
1628 public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
1629 {
1630 }
1627 } 1631 }
1628} 1632}
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index cf36d08..1573c73 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -1104,5 +1104,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC
1104 public void SendRebakeAvatarTextures(UUID textureID) 1104 public void SendRebakeAvatarTextures(UUID textureID)
1105 { 1105 {
1106 } 1106 }
1107
1108 public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
1109 {
1110 }
1107 } 1111 }
1108} 1112}
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 27025d9..6265ab7 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -1159,6 +1159,9 @@ namespace OpenSim.Tests.Common.Mock
1159 public void SendRebakeAvatarTextures(UUID textureID) 1159 public void SendRebakeAvatarTextures(UUID textureID)
1160 { 1160 {
1161 } 1161 }
1162 1162
1163 public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
1164 {
1165 }
1163 } 1166 }
1164} 1167}