From b03ecf24c4441bb26dfacfeaf372a40f42936687 Mon Sep 17 00:00:00 2001
From: "Huaiyu (Kitty) Liu" <huaiyu.liu@intel.com>
Date: Wed, 1 Jun 2011 15:37:14 -0700
Subject: [PATCH] Added catching exceptions other than WebException in
 doIMSending, so that it won't crash script engine and will report what
 exception it is.

---
 .../Avatar/InstantMessage/MessageTransferModule.cs            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index 29a862916e..bfb97dd44b 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -626,6 +626,10 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             {
                 m_log.ErrorFormat("[GRID INSTANT MESSAGE]: Error sending message to {0} the host didn't respond " + e.ToString(), reginfo.ServerURI.ToString());
             }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("[GRID INSTANT MESSAGE]: Error doIMSending to {0}, Error Message -- {1} ", reginfo.ServerURI.ToString(), e.ToString());
+            }
 
             return false;
         }