From 1313544ac7761ec7d84c14009fc95d5d7316004d Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Fri, 19 Oct 2007 22:02:07 +0000
Subject: * Major structural change: Begun converting Events to use (caller,
 args) syntax to conform with .NET guidelines. * OnChatFromViewer has been
 converted as an example. * Bug: SimpleApp's NPC client does not implement a
 Scene property and will likely crash with a NullReferenceException when it
 attempts to chat.

---
 .../Region/Environment/Scenes/Scene.PacketHandlers.cs   | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(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 df8b190..71f8037 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -70,7 +70,22 @@ namespace OpenSim.Region.Environment.Scenes
         {
             if (m_simChatModule != null)
             {
-                m_simChatModule.SimChat(message, type, channel, fromPos, fromName, fromAgentID);
+                ChatFromViewerArgs args = new ChatFromViewerArgs();
+
+                args.Message = OpenSim.Framework.Utilities.Util.FieldToString(message);
+                args.Channel = channel;
+                args.Type = (ChatTypeEnum)type;
+                args.Position = fromPos;
+
+                ScenePresence user = this.GetScenePresence(fromAgentID);
+                if (user != null)
+                    args.Sender = user.ControllingClient;
+                else
+                    args.Sender = null;
+
+                args.From = fromName;
+
+                m_simChatModule.SimChat(this, args);
             }
         }
 
-- 
cgit v1.1