OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster

avinationmerge
Melanie 2009-12-26 04:13:27 +00:00
parent 43c303e27a 88b3b98811
commit f3a4860635
8 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Client/MXP/ClientStack/MXPClientView.cs
View File

@ -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)
{
}
}
}

4
OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
View File

@ -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)
{
}
}
}

2
OpenSim/Framework/IClientAPI.cs
View File

@ -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);
}
}

17
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -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);
}
}
}

4
OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
View File

@ -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)
{
}
}
}

4
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
View File

@ -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)
{
}
}
}

4
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
View File

@ -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)
{
}
}
}

5
OpenSim/Tests/Common/Mock/TestClient.cs
View File

@ -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)
{
}
}
}