1 files changed, 29 insertions, 12 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index e4452fb..6d62ff0 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.Reflection;
 using log4net;
 using Nini.Config;
+using Mono.Addins;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
@@ -37,6 +38,7 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.Avatar.Chat
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ChatModule")]
     public class ChatModule : ISharedRegionModule
     {
         private static readonly ILog m_log =
@@ -186,6 +188,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
         {
             string fromName = c.From;
             UUID fromID = UUID.Zero;
+            UUID ownerID = UUID.Zero;
             UUID targetID = c.TargetUUID;
             string message = c.Message;
             IScene scene = c.Scene;
@@ -208,12 +211,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                 fromPos = avatar.AbsolutePosition;
                 fromName = avatar.Name;
                 fromID = c.Sender.AgentId;
+                ownerID = c.Sender.AgentId;
 
                 break;
 
             case ChatSourceType.Object:
                 fromID = c.SenderUUID;
 
+                if (c.SenderObject != null && c.SenderObject is SceneObjectPart)
+                    ownerID = ((SceneObjectPart)c.SenderObject).OwnerID;
+
                 break;
             }
 
@@ -236,7 +243,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                     s.ForEachRootScenePresence(
                         delegate(ScenePresence presence)
                         {
-                            if (TrySendChatMessage(presence, fromPos, regionPos, fromID, fromName, c.Type, message, sourceType, false))
+                            if (TrySendChatMessage(
+                                presence, fromPos, regionPos, fromID, ownerID, fromName, c.Type, message, sourceType, false))
                                 receiverIDs.Add(presence.UUID);
                         }
                     );
@@ -248,8 +256,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                     ScenePresence presence = s.GetScenePresence(targetID);
                     if (presence != null && !presence.IsChildAgent)
                     {
-                        if (TrySendChatMessage(presence, fromPos, regionPos, fromID, fromName, ChatTypeEnum.Say, message, sourceType, true))
-                                receiverIDs.Add(presence.UUID);
+                        if (TrySendChatMessage(
+                            presence, fromPos, regionPos, fromID, ownerID, fromName, ChatTypeEnum.Say, message, sourceType, true))
+                            receiverIDs.Add(presence.UUID);
                     }
                 }
             }
@@ -305,9 +314,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                         (null != c.SenderObject) &&
                         (((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId))
                         return;
-                    
-                    client.SendChatMessage(c.Message, (byte)cType, CenterOfRegion, fromName, fromID, 
-                                            (byte)sourceType, (byte)ChatAudibleLevel.Fully);
+
+                    client.SendChatMessage(
+                        c.Message, (byte)cType, CenterOfRegion, fromName, fromID, fromID,
+                        (byte)sourceType, (byte)ChatAudibleLevel.Fully);
+
                     receiverIDs.Add(client.AgentId);
                 });
             
@@ -322,15 +333,20 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
         /// <param name="fromPos"></param>
         /// <param name="regionPos">/param>
         /// <param name="fromAgentID"></param>
+        /// <param name='ownerID'>
+        /// Owner of the message.  For at least some messages from objects, this has to be correctly filled with the owner's UUID.
+        /// This is the case for script error messages in viewer 3 since LLViewer change EXT-7762
+        /// </param>
         /// <param name="fromName"></param>
         /// <param name="type"></param>
         /// <param name="message"></param>
         /// <param name="src"></param>
         /// <returns>true if the message was sent to the receiver, false if it was not sent due to failing a 
         /// precondition</returns>
-        protected virtual bool TrySendChatMessage(ScenePresence presence, Vector3 fromPos, Vector3 regionPos,
-                                                  UUID fromAgentID, string fromName, ChatTypeEnum type,
-                                                  string message, ChatSourceType src, bool ignoreDistance)
+        protected virtual bool TrySendChatMessage(
+            ScenePresence presence, Vector3 fromPos, Vector3 regionPos,
+            UUID fromAgentID, UUID ownerID, string fromName, ChatTypeEnum type,
+            string message, ChatSourceType src, bool ignoreDistance)
         {
             // don't send stuff to child agents
             if (presence.IsChildAgent) return false;
@@ -353,10 +369,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
             }
 
             // TODO: should change so the message is sent through the avatar rather than direct to the ClientView
-            presence.ControllingClient.SendChatMessage(message, (byte) type, fromPos, fromName,
-                                                       fromAgentID, (byte)src, (byte)ChatAudibleLevel.Fully);
+            presence.ControllingClient.SendChatMessage(
+                message, (byte) type, fromPos, fromName,
+                fromAgentID, ownerID, (byte)src, (byte)ChatAudibleLevel.Fully);
             
             return true;
         }
     }
-}
+}
\ No newline at end of file