diff options
| author | Justin Clark-Casey | 2010-05-14 21:22:53 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-05-14 21:24:28 +0100 |
| commit | 2f6bb013701b45421b906625560d8b417ad78689 (patch) | |
| tree | 9f14ecc6c11dd9d9ac62bf793624106df30bffd5 /OpenSim/Region | |
| parent | Fix linking issue introduced in my earlier commit (diff) | |
| download | opensim-SC_OLD-2f6bb013701b45421b906625560d8b417ad78689.zip opensim-SC_OLD-2f6bb013701b45421b906625560d8b417ad78689.tar.gz opensim-SC_OLD-2f6bb013701b45421b906625560d8b417ad78689.tar.bz2 opensim-SC_OLD-2f6bb013701b45421b906625560d8b417ad78689.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!
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | 4 |
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 | ||