Add mute list request event and dummy response
parent
b40ec850bb
commit
4f6c4378da
|
@ -746,6 +746,7 @@ namespace OpenSim.Client.MXP.ClientStack
|
||||||
public event PickGodDelete OnPickGodDelete;
|
public event PickGodDelete OnPickGodDelete;
|
||||||
public event PickInfoUpdate OnPickInfoUpdate;
|
public event PickInfoUpdate OnPickInfoUpdate;
|
||||||
public event AvatarNotesUpdate OnAvatarNotesUpdate;
|
public event AvatarNotesUpdate OnAvatarNotesUpdate;
|
||||||
|
public event MuteListRequest OnMuteListRequest;
|
||||||
#pragma warning restore 67
|
#pragma warning restore 67
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
@ -1596,5 +1597,9 @@ namespace OpenSim.Client.MXP.ClientStack
|
||||||
public void SendCreateGroupReply(UUID groupID, bool success, string message)
|
public void SendCreateGroupReply(UUID groupID, bool success, string message)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void SendUseCachedMuteList()
|
||||||
|
{
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -431,6 +431,7 @@ namespace OpenSim.Framework
|
||||||
public delegate void PickGodDelete(IClientAPI client, UUID agentID, UUID pickID, UUID queryID);
|
public delegate void PickGodDelete(IClientAPI client, UUID agentID, UUID pickID, UUID queryID);
|
||||||
public delegate void PickInfoUpdate(IClientAPI client, UUID pickID, UUID creatorID, bool topPick, string name, string desc, UUID snapshotID, int sortOrder, bool enabled);
|
public delegate void PickInfoUpdate(IClientAPI client, UUID pickID, UUID creatorID, bool topPick, string name, string desc, UUID snapshotID, int sortOrder, bool enabled);
|
||||||
public delegate void AvatarNotesUpdate(IClientAPI client, UUID targetID, string notes);
|
public delegate void AvatarNotesUpdate(IClientAPI client, UUID targetID, string notes);
|
||||||
|
public delegate void MuteListRequest(IClientAPI client, uint muteCRC);
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
@ -764,6 +765,8 @@ namespace OpenSim.Framework
|
||||||
event PickGodDelete OnPickGodDelete;
|
event PickGodDelete OnPickGodDelete;
|
||||||
event PickInfoUpdate OnPickInfoUpdate;
|
event PickInfoUpdate OnPickInfoUpdate;
|
||||||
event AvatarNotesUpdate OnAvatarNotesUpdate;
|
event AvatarNotesUpdate OnAvatarNotesUpdate;
|
||||||
|
|
||||||
|
event MuteListRequest OnMuteListRequest;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Set the debug level at which packet output should be printed to console.
|
/// Set the debug level at which packet output should be printed to console.
|
||||||
|
@ -1128,6 +1131,8 @@ namespace OpenSim.Framework
|
||||||
void SendParcelDwellReply(int localID, UUID parcelID, float dwell);
|
void SendParcelDwellReply(int localID, UUID parcelID, float dwell);
|
||||||
|
|
||||||
void SendUserInfoReply(bool imViaEmail, bool visible, string email);
|
void SendUserInfoReply(bool imViaEmail, bool visible, string email);
|
||||||
|
|
||||||
|
void SendUseCachedMuteList();
|
||||||
|
|
||||||
void KillEndDone();
|
void KillEndDone();
|
||||||
|
|
||||||
|
|
|
@ -303,6 +303,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
private PickInfoUpdate handlerPickInfoUpdate;
|
private PickInfoUpdate handlerPickInfoUpdate;
|
||||||
private AvatarNotesUpdate handlerAvatarNotesUpdate;
|
private AvatarNotesUpdate handlerAvatarNotesUpdate;
|
||||||
|
|
||||||
|
private MuteListRequest handlerMuteListRequest;
|
||||||
|
|
||||||
private readonly IGroupsModule m_GroupsModule;
|
private readonly IGroupsModule m_GroupsModule;
|
||||||
|
|
||||||
//private TerrainUnacked handlerUnackedTerrain = null;
|
//private TerrainUnacked handlerUnackedTerrain = null;
|
||||||
|
@ -1093,6 +1095,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
public event PickInfoUpdate OnPickInfoUpdate;
|
public event PickInfoUpdate OnPickInfoUpdate;
|
||||||
public event AvatarNotesUpdate OnAvatarNotesUpdate;
|
public event AvatarNotesUpdate OnAvatarNotesUpdate;
|
||||||
|
|
||||||
|
public event MuteListRequest OnMuteListRequest;
|
||||||
|
|
||||||
public void ActivateGesture(UUID assetId, UUID gestureId)
|
public void ActivateGesture(UUID assetId, UUID gestureId)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
@ -6822,8 +6826,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
//m_log.Warn("[CLIENT]: unhandled TransferAbort packet");
|
//m_log.Warn("[CLIENT]: unhandled TransferAbort packet");
|
||||||
break;
|
break;
|
||||||
case PacketType.MuteListRequest:
|
case PacketType.MuteListRequest:
|
||||||
// TODO: handle this packet
|
MuteListRequestPacket muteListRequest =
|
||||||
//m_log.Warn("[CLIENT]: unhandled MuteListRequest packet");
|
(MuteListRequestPacket)Pack;
|
||||||
|
|
||||||
|
handlerMuteListRequest = OnMuteListRequest;
|
||||||
|
if (handlerMuteListRequest != null)
|
||||||
|
{
|
||||||
|
handlerMuteListRequest(this, muteListRequest.MuteData.MuteCRC);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SendUseCachedMuteList();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case PacketType.UseCircuitCode:
|
case PacketType.UseCircuitCode:
|
||||||
// Don't display this one, we handle it at a lower level
|
// Don't display this one, we handle it at a lower level
|
||||||
|
@ -8676,6 +8690,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
OutPacket(createGroupReply, ThrottleOutPacketType.Task);
|
OutPacket(createGroupReply, ThrottleOutPacketType.Task);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void SendUseCachedMuteList()
|
||||||
|
{
|
||||||
|
UseCachedMuteListPacket useCachedMuteList = (UseCachedMuteListPacket)PacketPool.Instance.GetPacket(PacketType.UseCachedMuteList);
|
||||||
|
|
||||||
|
useCachedMuteList.AgentData = new UseCachedMuteListPacket.AgentDataBlock();
|
||||||
|
useCachedMuteList.AgentData.AgentID = AgentId;
|
||||||
|
|
||||||
|
OutPacket(useCachedMuteList, ThrottleOutPacketType.Task);
|
||||||
|
}
|
||||||
|
|
||||||
public string Report()
|
public string Report()
|
||||||
{
|
{
|
||||||
LLPacketHandler handler = (LLPacketHandler) m_PacketHandler;
|
LLPacketHandler handler = (LLPacketHandler) m_PacketHandler;
|
||||||
|
|
|
@ -260,6 +260,8 @@ namespace OpenSim.Region.Examples.SimpleModule
|
||||||
public event PickInfoUpdate OnPickInfoUpdate;
|
public event PickInfoUpdate OnPickInfoUpdate;
|
||||||
public event AvatarNotesUpdate OnAvatarNotesUpdate;
|
public event AvatarNotesUpdate OnAvatarNotesUpdate;
|
||||||
|
|
||||||
|
public event MuteListRequest OnMuteListRequest;
|
||||||
|
|
||||||
#pragma warning restore 67
|
#pragma warning restore 67
|
||||||
|
|
||||||
private UUID myID = UUID.Random();
|
private UUID myID = UUID.Random();
|
||||||
|
@ -1062,6 +1064,10 @@ namespace OpenSim.Region.Examples.SimpleModule
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void SendUseCachedMuteList()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -366,6 +366,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC
|
||||||
public event PickInfoUpdate OnPickInfoUpdate;
|
public event PickInfoUpdate OnPickInfoUpdate;
|
||||||
public event AvatarNotesUpdate OnAvatarNotesUpdate;
|
public event AvatarNotesUpdate OnAvatarNotesUpdate;
|
||||||
|
|
||||||
|
public event MuteListRequest OnMuteListRequest;
|
||||||
|
|
||||||
#pragma warning restore 67
|
#pragma warning restore 67
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
@ -1062,6 +1064,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void SendUseCachedMuteList()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -273,6 +273,8 @@ namespace OpenSim.Tests.Common.Mock
|
||||||
public event PickInfoUpdate OnPickInfoUpdate;
|
public event PickInfoUpdate OnPickInfoUpdate;
|
||||||
public event AvatarNotesUpdate OnAvatarNotesUpdate;
|
public event AvatarNotesUpdate OnAvatarNotesUpdate;
|
||||||
|
|
||||||
|
public event MuteListRequest OnMuteListRequest;
|
||||||
|
|
||||||
#pragma warning restore 67
|
#pragma warning restore 67
|
||||||
|
|
||||||
/// <value>
|
/// <value>
|
||||||
|
@ -1103,5 +1105,9 @@ namespace OpenSim.Tests.Common.Mock
|
||||||
public void SendCreateGroupReply(UUID groupID, bool success, string message)
|
public void SendCreateGroupReply(UUID groupID, bool success, string message)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void SendUseCachedMuteList()
|
||||||
|
{
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue