From a5967d918aee8cb6945b092f77b05def38d9eca8 Mon Sep 17 00:00:00 2001 From: Drake Arconis Date: Fri, 14 Aug 2015 18:10:07 -0400 Subject: [PATCH] Send a proper ownerid for Object messages to conform with what viewer expects Signed-off-by: Melanie Thielker --- OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs index 10122e6b56..a9d2de0b20 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs @@ -274,17 +274,20 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat string fromName = c.From; UUID fromID = UUID.Zero; + UUID ownerID = UUID.Zero; ChatSourceType sourceType = ChatSourceType.Object; if (null != c.Sender) { ScenePresence avatar = (c.Scene as Scene).GetScenePresence(c.Sender.AgentId); fromID = c.Sender.AgentId; fromName = avatar.Name; + ownerID = c.Sender.AgentId; sourceType = ChatSourceType.Agent; } else if (c.SenderUUID != UUID.Zero) { - fromID = c.SenderUUID; + fromID = c.SenderUUID; + ownerID = ((SceneObjectPart)c.SenderObject).OwnerID; } // m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType); @@ -302,7 +305,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat return; client.SendChatMessage( - c.Message, (byte)cType, CenterOfRegion, fromName, fromID, fromID, + c.Message, (byte)cType, CenterOfRegion, fromName, fromID, ownerID, (byte)sourceType, (byte)ChatAudibleLevel.Fully); receiverIDs.Add(client.AgentId);