From 20a77a6d4b05ee15b7b04a81920d19462e6e542a Mon Sep 17 00:00:00 2001
From: MW
Date: Thu, 12 Jul 2007 15:16:19 +0000
Subject: Fixed a number of bugs in the local InstantMessage handling, sending
 InstantMessages will no longer crash the server. But they still aren't really
 working correctly, you can't type replies to received messages.

---
 OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes')

diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index 1753772..14bf87c 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -113,8 +113,10 @@ namespace OpenSim.Region.Environment.Scenes
                 if (this.Avatars.ContainsKey(fromAgentID))
                 {
                     // Local sim message
-                    ScenePresence avatar = this.Avatars[fromAgentID];
-                    avatar.ControllingClient.SendInstantMessage(message, toAgentID);
+                    ScenePresence fromAvatar = this.Avatars[fromAgentID];
+                    ScenePresence toAvatar = this.Avatars[toAgentID];
+                    string fromName = fromAvatar.firstname + " " + fromAvatar.lastname;
+                    toAvatar.ControllingClient.SendInstantMessage(message, toAgentID, fromName);
                 }
                 else
                 {
-- 
cgit v1.1