Merge branch 'master' into careminster-presence-refactor

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 fc1afaf..d2dc1ab 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -183,6 +183,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 
             if (m_TransferModule != null)
             {
+                im.fromAgentName = client.FirstName + " " + client.LastName;
                 m_TransferModule.SendInstantMessage(im,
                     delegate(bool success)
                     {
@@ -223,4 +224,4 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             OnInstantMessage(null, msg);
         }
     }
-}
\ No newline at end of file
+}