From 2f6bb013701b45421b906625560d8b417ad78689 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey <caseyj@nematode.(none)>
Date: Fri, 14 May 2010 21:22:53 +0100
Subject: [PATCH] Apply patch from
 http://opensimulator.org/mantis/bug_view_page.php?bug_id=4671 Fixes a bug
 where the viewer didn't recieve the uuid of a chat broadcasting object Thanks
 crystalsgalicia!

---
 OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index 6dacbba0df..02f0968c40 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -264,6 +264,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                 fromName = avatar.Name;
                 sourceType = ChatSourceType.Agent;
             }
+            else if (c.SenderUUID != UUID.Zero) 
+            {
+                fromID = c.SenderUUID; 
+            }
             
             // m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType);