aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorKevin Cozens2013-06-10 19:59:08 -0400
committerJustin Clark-Casey (justincc)2013-06-18 23:15:38 +0100
commit3fe5e9057f4f45e39c3056742855f580a51c921f (patch)
tree20ba4bb1a21d3b24701897b934adcfa0a7646f33
parentminor: tidy up spacing if display a unit for additional stat information (diff)
downloadopensim-SC_OLD-3fe5e9057f4f45e39c3056742855f580a51c921f.zip
opensim-SC_OLD-3fe5e9057f4f45e39c3056742855f580a51c921f.tar.gz
opensim-SC_OLD-3fe5e9057f4f45e39c3056742855f580a51c921f.tar.bz2
opensim-SC_OLD-3fe5e9057f4f45e39c3056742855f580a51c921f.tar.xz
Prevent an exception if no offline messages were retrieved.
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
index 7d763fa..7f3d0a2 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
@@ -182,7 +182,10 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
182 "POST", m_RestURL + "/RetrieveMessages/", client.AgentId); 182 "POST", m_RestURL + "/RetrieveMessages/", client.AgentId);
183 183
184 if (msglist == null) 184 if (msglist == null)
185 {
185 m_log.WarnFormat("[OFFLINE MESSAGING]: WARNING null message list."); 186 m_log.WarnFormat("[OFFLINE MESSAGING]: WARNING null message list.");
187 return;
188 }
186 189
187 foreach (GridInstantMessage im in msglist) 190 foreach (GridInstantMessage im in msglist)
188 { 191 {