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.

1 files changed, 4 insertions, 2 deletions

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

                 {