Merge branch 'master' into careminster-presence-refactor

2010-09-25 06:57:53 +01:00 · 2010-09-25 06:57:53 +01:00 · 0080f28f1d
parent 4fbdcb95a0 d8ae287ebf
commit 0080f28f1d
1 changed files with 2 additions and 1 deletions
--- 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);
        }
    }
-}
+}