6 files changed, 21 insertions, 0 deletions

diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index 289b38c..3d734ad 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -1082,6 +1082,8 @@ namespace OpenSim.Client.MXP.ClientStack
         public event Action<IClientAPI> OnLogout;
         public event Action<IClientAPI> OnConnectionClosed;
 
+        public event RetrieveInstantMessages OnRetrieveInstantMessages;
+
 
         public void SendBlueBoxMessage(UUID FromAvatarID, string FromAvatarName, string Message)
         {
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index bfc70a4..4b95726 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -426,6 +426,7 @@ 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);
 
     #endregion
 
@@ -752,6 +753,8 @@ namespace OpenSim.Framework
 
         event UserInfoRequest OnUserInfoRequest;
         event UpdateUserInfo OnUpdateUserInfo;
+
+        event RetrieveInstantMessages OnRetrieveInstantMessages;
         
         /// <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 02e6b82..935f804 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -292,6 +292,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         private UserInfoRequest handlerUserInfoRequest;
         private UpdateUserInfo handlerUpdateUserInfo;
 
+        private RetrieveInstantMessages handlerRetrieveInstantMessages;
+
         private readonly IGroupsModule m_GroupsModule;
 
         //private TerrainUnacked handlerUnackedTerrain = null;
@@ -1075,6 +1077,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public event UserInfoRequest OnUserInfoRequest;
         public event UpdateUserInfo OnUpdateUserInfo;
 
+        public event RetrieveInstantMessages OnRetrieveInstantMessages;
+
         public void ActivateGesture(UUID assetId, UUID gestureId)
         {
         }
@@ -7433,6 +7437,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                                 eventNotificationRemove.EventData.EventID, this);
                     break;
 
+                case PacketType.RetrieveInstantMessages:
+                    handlerRetrieveInstantMessages = OnRetrieveInstantMessages;
+                    if (handlerRetrieveInstantMessages != null)
+                        handlerRetrieveInstantMessages(this);
+                    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 3d461e7..9828d68 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -253,6 +253,8 @@ namespace OpenSim.Region.Examples.SimpleModule
         public event UserInfoRequest OnUserInfoRequest;
         public event UpdateUserInfo OnUpdateUserInfo;
 
+        public event RetrieveInstantMessages OnRetrieveInstantMessages;
+
 #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 871a581..da2d781 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -359,6 +359,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         public event UserInfoRequest OnUserInfoRequest;
         public event UpdateUserInfo OnUpdateUserInfo;
 
+        public event RetrieveInstantMessages OnRetrieveInstantMessages;
+
 #pragma warning restore 67
 
         #endregion
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index ee4aaa8..16c55ae 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -264,6 +264,8 @@ namespace OpenSim.Tests.Common.Mock
         public event UserInfoRequest OnUserInfoRequest;
         public event UpdateUserInfo OnUpdateUserInfo;
 
+        public event RetrieveInstantMessages OnRetrieveInstantMessages;
+
 #pragma warning restore 67
 
         /// <value>