aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2009-03-28 04:21:44 +0000
committerMelanie Thielker2009-03-28 04:21:44 +0000
commit4f6c4378dad0f4122bdab9270fd7aaf3c60beb39 (patch)
tree1d36ab614a6ec70716a9d4afb2d1190eebea08d9
parentFix the plumbing in the offline message module. (diff)
downloadopensim-SC_OLD-4f6c4378dad0f4122bdab9270fd7aaf3c60beb39.zip
opensim-SC_OLD-4f6c4378dad0f4122bdab9270fd7aaf3c60beb39.tar.gz
opensim-SC_OLD-4f6c4378dad0f4122bdab9270fd7aaf3c60beb39.tar.bz2
opensim-SC_OLD-4f6c4378dad0f4122bdab9270fd7aaf3c60beb39.tar.xz
Add mute list request event and dummy response
-rw-r--r--OpenSim/Client/MXP/ClientStack/MXPClientView.cs5
-rw-r--r--OpenSim/Framework/IClientAPI.cs5
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs28
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs6
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs6
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs6
6 files changed, 54 insertions, 2 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index 4f4bd93..548c657 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -746,6 +746,7 @@ namespace OpenSim.Client.MXP.ClientStack
746 public event PickGodDelete OnPickGodDelete; 746 public event PickGodDelete OnPickGodDelete;
747 public event PickInfoUpdate OnPickInfoUpdate; 747 public event PickInfoUpdate OnPickInfoUpdate;
748 public event AvatarNotesUpdate OnAvatarNotesUpdate; 748 public event AvatarNotesUpdate OnAvatarNotesUpdate;
749 public event MuteListRequest OnMuteListRequest;
749 #pragma warning restore 67 750 #pragma warning restore 67
750 751
751 #endregion 752 #endregion
@@ -1596,5 +1597,9 @@ namespace OpenSim.Client.MXP.ClientStack
1596 public void SendCreateGroupReply(UUID groupID, bool success, string message) 1597 public void SendCreateGroupReply(UUID groupID, bool success, string message)
1597 { 1598 {
1598 } 1599 }
1600
1601 public void SendUseCachedMuteList()
1602 {
1603 }
1599 } 1604 }
1600} 1605}
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 66699b1..6d9ed79 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -431,6 +431,7 @@ namespace OpenSim.Framework
431 public delegate void PickGodDelete(IClientAPI client, UUID agentID, UUID pickID, UUID queryID); 431 public delegate void PickGodDelete(IClientAPI client, UUID agentID, UUID pickID, UUID queryID);
432 public delegate void PickInfoUpdate(IClientAPI client, UUID pickID, UUID creatorID, bool topPick, string name, string desc, UUID snapshotID, int sortOrder, bool enabled); 432 public delegate void PickInfoUpdate(IClientAPI client, UUID pickID, UUID creatorID, bool topPick, string name, string desc, UUID snapshotID, int sortOrder, bool enabled);
433 public delegate void AvatarNotesUpdate(IClientAPI client, UUID targetID, string notes); 433 public delegate void AvatarNotesUpdate(IClientAPI client, UUID targetID, string notes);
434 public delegate void MuteListRequest(IClientAPI client, uint muteCRC);
434 435
435 #endregion 436 #endregion
436 437
@@ -764,6 +765,8 @@ namespace OpenSim.Framework
764 event PickGodDelete OnPickGodDelete; 765 event PickGodDelete OnPickGodDelete;
765 event PickInfoUpdate OnPickInfoUpdate; 766 event PickInfoUpdate OnPickInfoUpdate;
766 event AvatarNotesUpdate OnAvatarNotesUpdate; 767 event AvatarNotesUpdate OnAvatarNotesUpdate;
768
769 event MuteListRequest OnMuteListRequest;
767 770
768 /// <summary> 771 /// <summary>
769 /// Set the debug level at which packet output should be printed to console. 772 /// Set the debug level at which packet output should be printed to console.
@@ -1128,6 +1131,8 @@ namespace OpenSim.Framework
1128 void SendParcelDwellReply(int localID, UUID parcelID, float dwell); 1131 void SendParcelDwellReply(int localID, UUID parcelID, float dwell);
1129 1132
1130 void SendUserInfoReply(bool imViaEmail, bool visible, string email); 1133 void SendUserInfoReply(bool imViaEmail, bool visible, string email);
1134
1135 void SendUseCachedMuteList();
1131 1136
1132 void KillEndDone(); 1137 void KillEndDone();
1133 1138
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 07f72c3..b65b3f9 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -303,6 +303,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
303 private PickInfoUpdate handlerPickInfoUpdate; 303 private PickInfoUpdate handlerPickInfoUpdate;
304 private AvatarNotesUpdate handlerAvatarNotesUpdate; 304 private AvatarNotesUpdate handlerAvatarNotesUpdate;
305 305
306 private MuteListRequest handlerMuteListRequest;
307
306 private readonly IGroupsModule m_GroupsModule; 308 private readonly IGroupsModule m_GroupsModule;
307 309
308 //private TerrainUnacked handlerUnackedTerrain = null; 310 //private TerrainUnacked handlerUnackedTerrain = null;
@@ -1093,6 +1095,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1093 public event PickInfoUpdate OnPickInfoUpdate; 1095 public event PickInfoUpdate OnPickInfoUpdate;
1094 public event AvatarNotesUpdate OnAvatarNotesUpdate; 1096 public event AvatarNotesUpdate OnAvatarNotesUpdate;
1095 1097
1098 public event MuteListRequest OnMuteListRequest;
1099
1096 public void ActivateGesture(UUID assetId, UUID gestureId) 1100 public void ActivateGesture(UUID assetId, UUID gestureId)
1097 { 1101 {
1098 } 1102 }
@@ -6822,8 +6826,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6822 //m_log.Warn("[CLIENT]: unhandled TransferAbort packet"); 6826 //m_log.Warn("[CLIENT]: unhandled TransferAbort packet");
6823 break; 6827 break;
6824 case PacketType.MuteListRequest: 6828 case PacketType.MuteListRequest:
6825 // TODO: handle this packet 6829 MuteListRequestPacket muteListRequest =
6826 //m_log.Warn("[CLIENT]: unhandled MuteListRequest packet"); 6830 (MuteListRequestPacket)Pack;
6831
6832 handlerMuteListRequest = OnMuteListRequest;
6833 if (handlerMuteListRequest != null)
6834 {
6835 handlerMuteListRequest(this, muteListRequest.MuteData.MuteCRC);
6836 }
6837 else
6838 {
6839 SendUseCachedMuteList();
6840 }
6827 break; 6841 break;
6828 case PacketType.UseCircuitCode: 6842 case PacketType.UseCircuitCode:
6829 // Don't display this one, we handle it at a lower level 6843 // Don't display this one, we handle it at a lower level
@@ -8676,6 +8690,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
8676 OutPacket(createGroupReply, ThrottleOutPacketType.Task); 8690 OutPacket(createGroupReply, ThrottleOutPacketType.Task);
8677 } 8691 }
8678 8692
8693 public void SendUseCachedMuteList()
8694 {
8695 UseCachedMuteListPacket useCachedMuteList = (UseCachedMuteListPacket)PacketPool.Instance.GetPacket(PacketType.UseCachedMuteList);
8696
8697 useCachedMuteList.AgentData = new UseCachedMuteListPacket.AgentDataBlock();
8698 useCachedMuteList.AgentData.AgentID = AgentId;
8699
8700 OutPacket(useCachedMuteList, ThrottleOutPacketType.Task);
8701 }
8702
8679 public string Report() 8703 public string Report()
8680 { 8704 {
8681 LLPacketHandler handler = (LLPacketHandler) m_PacketHandler; 8705 LLPacketHandler handler = (LLPacketHandler) m_PacketHandler;
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index c5b6a1e..fa01a42 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -260,6 +260,8 @@ namespace OpenSim.Region.Examples.SimpleModule
260 public event PickInfoUpdate OnPickInfoUpdate; 260 public event PickInfoUpdate OnPickInfoUpdate;
261 public event AvatarNotesUpdate OnAvatarNotesUpdate; 261 public event AvatarNotesUpdate OnAvatarNotesUpdate;
262 262
263 public event MuteListRequest OnMuteListRequest;
264
263#pragma warning restore 67 265#pragma warning restore 67
264 266
265 private UUID myID = UUID.Random(); 267 private UUID myID = UUID.Random();
@@ -1062,6 +1064,10 @@ namespace OpenSim.Region.Examples.SimpleModule
1062 { 1064 {
1063 } 1065 }
1064 1066
1067 public void SendUseCachedMuteList()
1068 {
1069 }
1070
1065 #endregion 1071 #endregion
1066 } 1072 }
1067} 1073}
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index e810b4e..4bf4341 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -366,6 +366,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC
366 public event PickInfoUpdate OnPickInfoUpdate; 366 public event PickInfoUpdate OnPickInfoUpdate;
367 public event AvatarNotesUpdate OnAvatarNotesUpdate; 367 public event AvatarNotesUpdate OnAvatarNotesUpdate;
368 368
369 public event MuteListRequest OnMuteListRequest;
370
369#pragma warning restore 67 371#pragma warning restore 67
370 372
371 #endregion 373 #endregion
@@ -1062,6 +1064,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC
1062 { 1064 {
1063 } 1065 }
1064 1066
1067 public void SendUseCachedMuteList()
1068 {
1069 }
1070
1065 #endregion 1071 #endregion
1066 } 1072 }
1067} 1073}
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index fac0185..f96057c 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -273,6 +273,8 @@ namespace OpenSim.Tests.Common.Mock
273 public event PickInfoUpdate OnPickInfoUpdate; 273 public event PickInfoUpdate OnPickInfoUpdate;
274 public event AvatarNotesUpdate OnAvatarNotesUpdate; 274 public event AvatarNotesUpdate OnAvatarNotesUpdate;
275 275
276 public event MuteListRequest OnMuteListRequest;
277
276#pragma warning restore 67 278#pragma warning restore 67
277 279
278 /// <value> 280 /// <value>
@@ -1103,5 +1105,9 @@ namespace OpenSim.Tests.Common.Mock
1103 public void SendCreateGroupReply(UUID groupID, bool success, string message) 1105 public void SendCreateGroupReply(UUID groupID, bool success, string message)
1104 { 1106 {
1105 } 1107 }
1108
1109 public void SendUseCachedMuteList()
1110 {
1111 }
1106 } 1112 }
1107} 1113}