Plumb in the RetrieveInstantMessages event that is sent by the viewer

when it is ready to receive offline IM

3 files changed, 14 insertions, 0 deletions

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