aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index bafb802..af39565 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -158,7 +158,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
158 158
159 if (m_TransferModule != null) 159 if (m_TransferModule != null)
160 { 160 {
161 im.fromAgentName = client.FirstName + " " + client.LastName; 161 if (client != null)
162 im.fromAgentName = client.FirstName + " " + client.LastName;
162 m_TransferModule.SendInstantMessage(im, 163 m_TransferModule.SendInstantMessage(im,
163 delegate(bool success) 164 delegate(bool success)
164 { 165 {