Merge branch 'master' into careminster

OpenSim/Client/MXP/ClientStack/MXPClientView.cs

@@ -1655,5 +1655,9 @@ namespace OpenSim.Client.MXP.ClientStack
         public void SendRebakeAvatarTextures(UUID textureID)
         {
         }
+
+        public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
+        {
+        }
     }
 }

OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs

@@ -1161,5 +1161,9 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
         public void SendRebakeAvatarTextures(UUID textureID)
         {
         }
+
+        public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
+        {
+        }
     }
 }

OpenSim/Framework/IClientAPI.cs

@@ -1392,5 +1392,7 @@ namespace OpenSim.Framework
         bool AddGenericPacketHandler(string MethodName, GenericMessage handler);
 
         void SendRebakeAvatarTextures(UUID textureID);
+
+        void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages);
     }
 }

OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs

@@ -15792,5 +15792,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             return osdEvent;
         }
+
+        public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
+        {
+            AvatarInterestsReplyPacket packet = (AvatarInterestsReplyPacket)PacketPool.Instance.GetPacket(PacketType.AvatarInterestsReply);
+
+            packet.AgentData = new AvatarInterestsReplyPacket.AgentDataBlock();
+            packet.AgentData.AgentID = AgentId;
+            packet.AgentData.AvatarID = avatarID;
+
+            packet.PropertiesData = new AvatarInterestsReplyPacket.PropertiesDataBlock();
+            packet.PropertiesData.WantToMask = wantMask;
+            packet.PropertiesData.WantToText = Utils.StringToBytes(wantText);
+            packet.PropertiesData.SkillsMask = skillsMask;
+            packet.PropertiesData.SkillsText = Utils.StringToBytes(skillsText);
+            packet.PropertiesData.LanguagesText = Utils.StringToBytes(languages);
+            OutPacket(packet, ThrottleOutPacketType.Task);
+        }
     }
 }

OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs

@@ -1099,5 +1099,9 @@ namespace OpenSim.Region.Examples.SimpleModule
         public void SendRebakeAvatarTextures(UUID textureID)
         {
         }
+
+        public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
+        {
+        }
     }
 }

OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs

@@ -1624,5 +1624,9 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
         public void SendRebakeAvatarTextures(UUID textureID)
         {
         }
+
+        public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
+        {
+        }
     }
 }

OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs

@@ -1104,5 +1104,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         public void SendRebakeAvatarTextures(UUID textureID)
         {
         }
+
+        public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
+        {
+        }
     }
 }

OpenSim/Tests/Common/Mock/TestClient.cs

@@ -1159,6 +1159,9 @@ namespace OpenSim.Tests.Common.Mock
         public void SendRebakeAvatarTextures(UUID textureID)
         {
         }
-
+        
+        public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
+        {
+        }
     }
 }