aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Client/MXP/ClientStack/MXPClientView.cs4
-rw-r--r--OpenSim/Framework/IClientAPI.cs9
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs55
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs5
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs5
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs5
6 files changed, 83 insertions, 0 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index 8226ac9..0da0743 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -742,6 +742,10 @@ namespace OpenSim.Client.MXP.ClientStack
742 public event Action<IClientAPI> OnLogout; 742 public event Action<IClientAPI> OnLogout;
743 public event Action<IClientAPI> OnConnectionClosed; 743 public event Action<IClientAPI> OnConnectionClosed;
744 public event RetrieveInstantMessages OnRetrieveInstantMessages; 744 public event RetrieveInstantMessages OnRetrieveInstantMessages;
745 public event PickDelete OnPickDelete;
746 public event PickGodDelete OnPickGodDelete;
747 public event PickInfoUpdate OnPickInfoUpdate;
748 public event AvatarNotesUpdate OnAvatarNotesUpdate;
745 #pragma warning restore 67 749 #pragma warning restore 67
746 750
747 #endregion 751 #endregion
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 4a0becd..ce4d411 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -427,6 +427,10 @@ namespace OpenSim.Framework
427 public delegate void UserInfoRequest(IClientAPI client); 427 public delegate void UserInfoRequest(IClientAPI client);
428 public delegate void UpdateUserInfo(bool imViaEmail, bool visible, IClientAPI client); 428 public delegate void UpdateUserInfo(bool imViaEmail, bool visible, IClientAPI client);
429 public delegate void RetrieveInstantMessages(IClientAPI client); 429 public delegate void RetrieveInstantMessages(IClientAPI client);
430 public delegate void PickDelete(IClientAPI client, UUID pickID);
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);
433 public delegate void AvatarNotesUpdate(IClientAPI client, UUID targetID, string notes);
430 434
431 #endregion 435 #endregion
432 436
@@ -755,6 +759,11 @@ namespace OpenSim.Framework
755 event UpdateUserInfo OnUpdateUserInfo; 759 event UpdateUserInfo OnUpdateUserInfo;
756 760
757 event RetrieveInstantMessages OnRetrieveInstantMessages; 761 event RetrieveInstantMessages OnRetrieveInstantMessages;
762
763 event PickDelete OnPickDelete;
764 event PickGodDelete OnPickGodDelete;
765 event PickInfoUpdate OnPickInfoUpdate;
766 event AvatarNotesUpdate OnAvatarNotesUpdate;
758 767
759 /// <summary> 768 /// <summary>
760 /// Set the debug level at which packet output should be printed to console. 769 /// Set the debug level at which packet output should be printed to console.
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 537e24b..47585f9 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -298,6 +298,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
298 298
299 private RetrieveInstantMessages handlerRetrieveInstantMessages; 299 private RetrieveInstantMessages handlerRetrieveInstantMessages;
300 300
301 private PickDelete handlerPickDelete;
302 private PickGodDelete handlerPickGodDelete;
303 private PickInfoUpdate handlerPickInfoUpdate;
304 private AvatarNotesUpdate handlerAvatarNotesUpdate;
305
301 private readonly IGroupsModule m_GroupsModule; 306 private readonly IGroupsModule m_GroupsModule;
302 307
303 //private TerrainUnacked handlerUnackedTerrain = null; 308 //private TerrainUnacked handlerUnackedTerrain = null;
@@ -1083,6 +1088,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1083 1088
1084 public event RetrieveInstantMessages OnRetrieveInstantMessages; 1089 public event RetrieveInstantMessages OnRetrieveInstantMessages;
1085 1090
1091 public event PickDelete OnPickDelete;
1092 public event PickGodDelete OnPickGodDelete;
1093 public event PickInfoUpdate OnPickInfoUpdate;
1094 public event AvatarNotesUpdate OnAvatarNotesUpdate;
1095
1086 public void ActivateGesture(UUID assetId, UUID gestureId) 1096 public void ActivateGesture(UUID assetId, UUID gestureId)
1087 { 1097 {
1088 } 1098 }
@@ -7517,6 +7527,51 @@ namespace OpenSim.Region.ClientStack.LindenUDP
7517 handlerRetrieveInstantMessages(this); 7527 handlerRetrieveInstantMessages(this);
7518 break; 7528 break;
7519 7529
7530 case PacketType.PickDelete:
7531 PickDeletePacket pickDelete =
7532 (PickDeletePacket)Pack;
7533
7534 handlerPickDelete = OnPickDelete;
7535 if (handlerPickDelete != null)
7536 handlerPickDelete(this, pickDelete.Data.PickID);
7537 break;
7538 case PacketType.PickGodDelete:
7539 PickGodDeletePacket pickGodDelete =
7540 (PickGodDeletePacket)Pack;
7541
7542 handlerPickGodDelete = OnPickGodDelete;
7543 if (handlerPickGodDelete != null)
7544 handlerPickGodDelete(this,
7545 pickGodDelete.AgentData.AgentID,
7546 pickGodDelete.Data.PickID,
7547 pickGodDelete.Data.QueryID);
7548 break;
7549 case PacketType.PickInfoUpdate:
7550 PickInfoUpdatePacket pickInfoUpdate =
7551 (PickInfoUpdatePacket)Pack;
7552
7553 handlerPickInfoUpdate = OnPickInfoUpdate;
7554 if (handlerPickInfoUpdate != null)
7555 handlerPickInfoUpdate(this,
7556 pickInfoUpdate.Data.PickID,
7557 pickInfoUpdate.Data.CreatorID,
7558 pickInfoUpdate.Data.TopPick,
7559 Utils.BytesToString(pickInfoUpdate.Data.Name),
7560 Utils.BytesToString(pickInfoUpdate.Data.Desc),
7561 pickInfoUpdate.Data.SnapshotID,
7562 pickInfoUpdate.Data.SortOrder,
7563 pickInfoUpdate.Data.Enabled);
7564 break;
7565 case PacketType.AvatarNotesUpdate:
7566 AvatarNotesUpdatePacket avatarNotesUpdate =
7567 (AvatarNotesUpdatePacket)Pack;
7568
7569 handlerAvatarNotesUpdate = OnAvatarNotesUpdate;
7570 if (handlerAvatarNotesUpdate != null)
7571 handlerAvatarNotesUpdate(this,
7572 avatarNotesUpdate.Data.TargetID,
7573 Utils.BytesToString(avatarNotesUpdate.Data.Notes));
7574 break;
7520 default: 7575 default:
7521 m_log.Warn("[CLIENT]: unhandled packet " + Pack); 7576 m_log.Warn("[CLIENT]: unhandled packet " + Pack);
7522 break; 7577 break;
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 803eeb4..599236e 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -255,6 +255,11 @@ namespace OpenSim.Region.Examples.SimpleModule
255 255
256 public event RetrieveInstantMessages OnRetrieveInstantMessages; 256 public event RetrieveInstantMessages OnRetrieveInstantMessages;
257 257
258 public event PickDelete OnPickDelete;
259 public event PickGodDelete OnPickGodDelete;
260 public event PickInfoUpdate OnPickInfoUpdate;
261 public event AvatarNotesUpdate OnAvatarNotesUpdate;
262
258#pragma warning restore 67 263#pragma warning restore 67
259 264
260 private UUID myID = UUID.Random(); 265 private UUID myID = UUID.Random();
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 71f7cc0..c182048 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -361,6 +361,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC
361 361
362 public event RetrieveInstantMessages OnRetrieveInstantMessages; 362 public event RetrieveInstantMessages OnRetrieveInstantMessages;
363 363
364 public event PickDelete OnPickDelete;
365 public event PickGodDelete OnPickGodDelete;
366 public event PickInfoUpdate OnPickInfoUpdate;
367 public event AvatarNotesUpdate OnAvatarNotesUpdate;
368
364#pragma warning restore 67 369#pragma warning restore 67
365 370
366 #endregion 371 #endregion
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 926d138..b4b0bea 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -268,6 +268,11 @@ namespace OpenSim.Tests.Common.Mock
268 268
269 public event RetrieveInstantMessages OnRetrieveInstantMessages; 269 public event RetrieveInstantMessages OnRetrieveInstantMessages;
270 270
271 public event PickDelete OnPickDelete;
272 public event PickGodDelete OnPickGodDelete;
273 public event PickInfoUpdate OnPickInfoUpdate;
274 public event AvatarNotesUpdate OnAvatarNotesUpdate;
275
271#pragma warning restore 67 276#pragma warning restore 67
272 277
273 /// <value> 278 /// <value>