This changeset changes the way chat from client is routed:

     old way: each region module interested in chat from client had to
     	 - subscribe to scene.EventManager.OnNewClient
	 - then in its OnNewClient delegate it would subscribe to
           client.OnChatFromViewer to capture chat messages coming

     new way: ChatModule is the only region module that uses the "old
         way" approach but is now forwarding all client chat via
         scene.EventManager.OnChatFromClient
	 - each region module interested in chat from client now only
           subscribes to scene.EventManager.OnChatFromClient

this not only simplifies code, but also allows us to substitute
ChatModule with derived classes (ConciergeModule is going to be one
example).

Also, this changeset changes ChatFromViewer to ChatFromClient as it
doesn't necessarily have to be a viewer that is a chat source.

i've taken great care to only comment out those OnNewClient delegates
that were only used for getting at the client chat --- hope it's not
breaking anything.

1 files changed, 3 insertions, 2 deletions

diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs
index cdd4f4e..6eaaacd 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs
@@ -381,7 +381,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
         protected void StartManaging(IClientAPI client)
         {
             m_log.Debug("[CONTENT MANAGEMENT] Registering channel with chat services.");
-            client.OnChatFromViewer += SimChatSent;
+            // client.OnChatFromClient += SimChatSent;
             //init = true;
 
             OnNewClient(client);
@@ -412,7 +412,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
                 {
                     IClientAPI client = presence.ControllingClient;
                     m_log.Debug("[CONTENT MANAGEMENT] Unregistering channel with chat services.");
-                    client.OnChatFromViewer -= SimChatSent;
+                    // client.OnChatFromViewer -= SimChatSent;
 
                     m_log.Debug("[CONTENT MANAGEMENT] Removing handlers to client");
                     client.OnUpdatePrimScale -= UpdateSingleScale;
@@ -641,6 +641,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
             m_log.Debug("[CONTENT MANAGEMENT] Initializing Content Management System.");
 
             scene.EventManager.OnNewClient += StartManaging;
+            scene.EventManager.OnChatFromClient += SimChatSent;
             scene.EventManager.OnRemovePresence += StopManaging;
             //    scene.EventManager.OnAvatarEnteringNewParcel += AvatarEnteringParcel;
             scene.EventManager.OnObjectBeingRemovedFromScene += GroupBeingDeleted;