aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey2010-05-14 21:22:53 +0100
committerJustin Clark-Casey2010-05-14 21:25:14 +0100
commit3d72a73b22b0cf0dbe951a3e0ae28473728b01a0 (patch)
tree75e2352b01d51cf19f9539bd7cf2ed1fa73f2a73
parentMade fields consistently protected. (diff)
downloadopensim-SC_OLD-3d72a73b22b0cf0dbe951a3e0ae28473728b01a0.zip
opensim-SC_OLD-3d72a73b22b0cf0dbe951a3e0ae28473728b01a0.tar.gz
opensim-SC_OLD-3d72a73b22b0cf0dbe951a3e0ae28473728b01a0.tar.bz2
opensim-SC_OLD-3d72a73b22b0cf0dbe951a3e0ae28473728b01a0.tar.xz
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!
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index 6dacbba..02f0968 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
264 fromName = avatar.Name; 264 fromName = avatar.Name;
265 sourceType = ChatSourceType.Agent; 265 sourceType = ChatSourceType.Agent;
266 } 266 }
267 else if (c.SenderUUID != UUID.Zero)
268 {
269 fromID = c.SenderUUID;
270 }
267 271
268 // m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType); 272 // m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType);
269 273