aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDiva Canto2011-06-07 10:51:12 -0700
committerDiva Canto2011-06-07 10:51:12 -0700
commitf5d82350bb622baa6f49042882e6c5cb49b24cc0 (patch)
tree1a81ac14685a3b826467a2f6c96a9738b9046c42 /OpenSim/Region
parentMore on the hunt for the slow down on HGFriendsModule. - Don't requests the o... (diff)
downloadopensim-SC_OLD-f5d82350bb622baa6f49042882e6c5cb49b24cc0.zip
opensim-SC_OLD-f5d82350bb622baa6f49042882e6c5cb49b24cc0.tar.gz
opensim-SC_OLD-f5d82350bb622baa6f49042882e6c5cb49b24cc0.tar.bz2
opensim-SC_OLD-f5d82350bb622baa6f49042882e6c5cb49b24cc0.tar.xz
This fixes the crash reported in http://opensimulator.org/mantis/view.php?id=5529 related to sending IMs to foreign friends who are offline. Hopefully.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
index dee86df..7753c25 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
@@ -196,10 +196,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
196 196
197 Util.FireAndForget(delegate 197 Util.FireAndForget(delegate
198 { 198 {
199 bool success = m_IMService.OutgoingInstantMessage(im, url, foreigner); 199 bool success = false;
200 if (!success && account == null) 200 if (foreigner && url == string.Empty) // we don't know about this user
201 { 201 {
202 // One last chance
203 string recipientUUI = TryGetRecipientUUI(new UUID(im.fromAgentID), toAgentID); 202 string recipientUUI = TryGetRecipientUUI(new UUID(im.fromAgentID), toAgentID);
204 m_log.DebugFormat("[HG MESSAGE TRANSFER]: Got UUI {0}", recipientUUI); 203 m_log.DebugFormat("[HG MESSAGE TRANSFER]: Got UUI {0}", recipientUUI);
205 if (recipientUUI != string.Empty) 204 if (recipientUUI != string.Empty)
@@ -213,6 +212,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
213 } 212 }
214 } 213 }
215 } 214 }
215 else
216 success = m_IMService.OutgoingInstantMessage(im, url, foreigner);
217
216 if (!success && !foreigner) 218 if (!success && !foreigner)
217 HandleUndeliveredMessage(im, result); 219 HandleUndeliveredMessage(im, result);
218 else 220 else