Initial update to OpenSim 0.8.2.1 source code.

1 files changed, 14 insertions, 4 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
index 7bf19c2..a1b918a 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
@@ -210,10 +210,10 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                     success = m_IMService.OutgoingInstantMessage(im, url, foreigner);
 
                 if (!success && !foreigner)
-                    HandleUndeliveredMessage(im, result);
+                    HandleUndeliverableMessage(im, result);
                 else
                     result(success);
-            });
+            }, null, "HGMessageTransferModule.SendInstantMessage");
 
             return;
         }
@@ -246,7 +246,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             return successful;
         }
 
-        protected void HandleUndeliveredMessage(GridInstantMessage im, MessageResultNotification result)
+        public void HandleUndeliverableMessage(GridInstantMessage im, MessageResultNotification result)
         {
             UndeliveredMessage handlerUndeliveredMessage = OnUndeliveredMessage;
 
@@ -282,7 +282,17 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                         string uasURL = circuit.ServiceURLs["HomeURI"].ToString();
                         m_log.DebugFormat("[HG MESSAGE TRANSFER]: getting UUI of user {0} from {1}", toAgent, uasURL);
                         UserAgentServiceConnector uasConn = new UserAgentServiceConnector(uasURL);
-                        return uasConn.GetUUI(fromAgent, toAgent);
+
+                        string agentUUI = string.Empty;
+                        try
+                        {
+                            agentUUI = uasConn.GetUUI(fromAgent, toAgent);
+                        }
+                        catch (Exception e) {
+                            m_log.Debug("[HG MESSAGE TRANSFER]: GetUUI call failed ", e);
+                        }
+
+                        return agentUUI;
                     }
                 }
             }