Fix the plumbing in the offline message module.

No functionality yet.

1 files changed, 12 insertions, 6 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index f67bb0b..d8d6219 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -167,6 +167,13 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                 return;
             }
 
+            HandleUndeliveredMessage(im, result);
+
+            return;
+        }
+
+        private void HandleUndeliveredMessage(GridInstantMessage im, MessageResultNotification result)
+        {
             UndeliveredMessage handlerUndeliveredMessage = OnUndeliveredMessage;
 
             // If this event has handlers, then the IM will be considered
@@ -181,7 +188,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 
             //m_log.DebugFormat("[INSTANT MESSAGE]: Undeliverable");
             result(false);
-            return;
         }
 
         /// <summary>
@@ -487,14 +493,14 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                     if (upd.Handle == prevRegionHandle)
                     {
                         m_log.Error("[GRID INSTANT MESSAGE]: Unable to deliver an instant message");
-                        result(false);
+                        HandleUndeliveredMessage(im, result);
                         return;
                     }
                 }
                 else
                 {
                     m_log.Error("[GRID INSTANT MESSAGE]: Unable to deliver an instant message");
-                    result(false);
+                    HandleUndeliveredMessage(im, result);
                     return;
                 }
             }
@@ -544,18 +550,18 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                     else
                     {
                         m_log.WarnFormat("[GRID INSTANT MESSAGE]: Unable to find region {0}", upd.Handle);
-                        result(false);
+                        HandleUndeliveredMessage(im, result);
                     }
                 }
                 else
                 {
-                    result(false);
+                    HandleUndeliveredMessage(im, result);
                 }
             }
             else
             {
                 m_log.WarnFormat("[GRID INSTANT MESSAGE]: Unable to find user {0}", toAgentID);
-                result(false);
+                HandleUndeliveredMessage(im, result);
             }
         }