diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index 8226ac9319..0da0743820 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -742,6 +742,10 @@ namespace OpenSim.Client.MXP.ClientStack
         public event Action<IClientAPI> OnLogout;
         public event Action<IClientAPI> OnConnectionClosed;
         public event RetrieveInstantMessages OnRetrieveInstantMessages;
+        public event PickDelete OnPickDelete;
+        public event PickGodDelete OnPickGodDelete;
+        public event PickInfoUpdate OnPickInfoUpdate;
+        public event AvatarNotesUpdate OnAvatarNotesUpdate;
         #pragma warning restore 67
 
         #endregion
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 4a0becd977..ce4d411ab9 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -427,6 +427,10 @@ namespace OpenSim.Framework
     public delegate void UserInfoRequest(IClientAPI client);
     public delegate void UpdateUserInfo(bool imViaEmail, bool visible, IClientAPI client);
     public delegate void RetrieveInstantMessages(IClientAPI client);
+    public delegate void PickDelete(IClientAPI client, UUID pickID);
+    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 AvatarNotesUpdate(IClientAPI client, UUID targetID, string notes);
 
     #endregion
 
@@ -755,6 +759,11 @@ namespace OpenSim.Framework
         event UpdateUserInfo OnUpdateUserInfo;
 
         event RetrieveInstantMessages OnRetrieveInstantMessages;
+
+        event PickDelete OnPickDelete;
+        event PickGodDelete OnPickGodDelete;
+        event PickInfoUpdate OnPickInfoUpdate;
+        event AvatarNotesUpdate OnAvatarNotesUpdate;
         
         /// <summary>
         /// 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 537e24b6ca..47585f9293 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -298,6 +298,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         private RetrieveInstantMessages handlerRetrieveInstantMessages;
 
+        private PickDelete handlerPickDelete;
+        private PickGodDelete handlerPickGodDelete;
+        private PickInfoUpdate handlerPickInfoUpdate;
+        private AvatarNotesUpdate handlerAvatarNotesUpdate;
+
         private readonly IGroupsModule m_GroupsModule;
 
         //private TerrainUnacked handlerUnackedTerrain = null;
@@ -1083,6 +1088,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public event RetrieveInstantMessages OnRetrieveInstantMessages;
 
+        public event PickDelete OnPickDelete;
+        public event PickGodDelete OnPickGodDelete;
+        public event PickInfoUpdate OnPickInfoUpdate;
+        public event AvatarNotesUpdate OnAvatarNotesUpdate;
+
         public void ActivateGesture(UUID assetId, UUID gestureId)
         {
         }
@@ -7517,6 +7527,51 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         handlerRetrieveInstantMessages(this);
                     break;
 
+                case PacketType.PickDelete:
+                    PickDeletePacket pickDelete =
+                            (PickDeletePacket)Pack;
+
+                    handlerPickDelete = OnPickDelete;
+                    if (handlerPickDelete != null)
+                        handlerPickDelete(this, pickDelete.Data.PickID); 
+                    break;
+                case PacketType.PickGodDelete:
+                    PickGodDeletePacket pickGodDelete =
+                            (PickGodDeletePacket)Pack;
+
+                    handlerPickGodDelete = OnPickGodDelete;
+                    if (handlerPickGodDelete != null)
+                        handlerPickGodDelete(this,
+                                pickGodDelete.AgentData.AgentID,
+                                pickGodDelete.Data.PickID,
+                                pickGodDelete.Data.QueryID); 
+                    break;
+                case PacketType.PickInfoUpdate:
+                    PickInfoUpdatePacket pickInfoUpdate =
+                            (PickInfoUpdatePacket)Pack;
+
+                    handlerPickInfoUpdate = OnPickInfoUpdate;
+                    if (handlerPickInfoUpdate != null)
+                        handlerPickInfoUpdate(this,
+                                pickInfoUpdate.Data.PickID,
+                                pickInfoUpdate.Data.CreatorID,
+                                pickInfoUpdate.Data.TopPick,
+                                Utils.BytesToString(pickInfoUpdate.Data.Name),
+                                Utils.BytesToString(pickInfoUpdate.Data.Desc),
+                                pickInfoUpdate.Data.SnapshotID,
+                                pickInfoUpdate.Data.SortOrder,
+                                pickInfoUpdate.Data.Enabled);
+                    break;
+                case PacketType.AvatarNotesUpdate:
+                    AvatarNotesUpdatePacket avatarNotesUpdate =
+                            (AvatarNotesUpdatePacket)Pack;
+
+                    handlerAvatarNotesUpdate = OnAvatarNotesUpdate;
+                    if (handlerAvatarNotesUpdate != null)
+                        handlerAvatarNotesUpdate(this,
+                                avatarNotesUpdate.Data.TargetID,
+                                Utils.BytesToString(avatarNotesUpdate.Data.Notes));
+                    break;
                 default:
                     m_log.Warn("[CLIENT]: unhandled packet " + Pack);
                     break;
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 803eeb418b..599236e854 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -255,6 +255,11 @@ namespace OpenSim.Region.Examples.SimpleModule
 
         public event RetrieveInstantMessages OnRetrieveInstantMessages;
 
+        public event PickDelete OnPickDelete;
+        public event PickGodDelete OnPickGodDelete;
+        public event PickInfoUpdate OnPickInfoUpdate;
+        public event AvatarNotesUpdate OnAvatarNotesUpdate;
+
 #pragma warning restore 67
 
         private UUID myID = UUID.Random();
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 71f7cc0863..c182048a3c 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
 
         public event RetrieveInstantMessages OnRetrieveInstantMessages;
 
+        public event PickDelete OnPickDelete;
+        public event PickGodDelete OnPickGodDelete;
+        public event PickInfoUpdate OnPickInfoUpdate;
+        public event AvatarNotesUpdate OnAvatarNotesUpdate;
+
 #pragma warning restore 67
 
         #endregion
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 926d1383b3..b4b0bea1d1 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -268,6 +268,11 @@ namespace OpenSim.Tests.Common.Mock
 
         public event RetrieveInstantMessages OnRetrieveInstantMessages;
 
+        public event PickDelete OnPickDelete;
+        public event PickGodDelete OnPickGodDelete;
+        public event PickInfoUpdate OnPickInfoUpdate;
+        public event AvatarNotesUpdate OnAvatarNotesUpdate;
+
 #pragma warning restore 67
 
         /// <value>