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

2 files changed, 18 insertions, 1 deletions

diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index d92127f..05b1118 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -100,7 +100,17 @@ namespace OpenSim.Region.ClientStack
 
                         if (OnChatFromViewer != null)
                         {
-                            this.OnChatFromViewer(message, type, channel, fromPos, fromName, fromAgentID);
+                            ChatFromViewerArgs args = new ChatFromViewerArgs();
+                            args.Channel = channel;
+                            args.From = fromName;
+                            args.Message = Util.FieldToString(message);
+                            args.Type = (ChatTypeEnum)type;
+                            args.Position = fromPos;
+
+                            args.Scene = Scene;
+                            args.Sender = this;
+
+                            this.OnChatFromViewer(this, args);
                         }
                         break;
                     case PacketType.ImprovedInstantMessage:
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 2489739..cf4072c 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -68,7 +68,14 @@ namespace OpenSim.Region.ClientStack
         //private AgentAssetUpload UploadAssets;
         private LLUUID newAssetFolder = LLUUID.Zero;
         private int debug = 0;
+
         protected IScene m_scene;
+
+        public IScene Scene
+        {
+            get { return m_scene; }
+        }
+
         private ClientManager m_clientManager;
         private AssetCache m_assetCache;
         // private InventoryCache m_inventoryCache;