* 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.

1 files changed, 5 insertions, 6 deletions

diff --git a/OpenSim/Region/Environment/Modules/WorldCommModule.cs b/OpenSim/Region/Environment/Modules/WorldCommModule.cs
index 765f1b4..cf5bba3 100644
--- a/OpenSim/Region/Environment/Modules/WorldCommModule.cs
+++ b/OpenSim/Region/Environment/Modules/WorldCommModule.cs
@@ -119,13 +119,12 @@ namespace OpenSim.Region.Environment.Modules
             client.OnChatFromViewer += DeliverClientMessage;
         }
 
-        private void DeliverClientMessage(byte[] message, byte type, int channel, LLVector3 fromPos, string fromName,
-                            LLUUID fromAgentID)
+        private void DeliverClientMessage(Object sender, ChatFromViewerArgs e)
         {
-            ASCIIEncoding ae = new ASCIIEncoding();
-
-            DeliverMessage(fromAgentID.ToString(), type, channel, fromName, ae.GetString(message));
-            
+            DeliverMessage(e.Sender.AgentId.ToString(),
+                (int)e.Type, e.Channel,
+                e.Sender.FirstName + " " + e.Sender.LastName,
+                e.Message);
         }
 
         public int Listen(uint localID, LLUUID itemID, LLUUID hostID, int channel, string name, string id, string msg)