diff options
| author | Justin Clark-Casey (justincc) | 2010-05-14 23:44:09 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-05-14 23:44:09 +0100 |
| commit | 3a8128d30931562f3afdbd929f95d69a8ce4cd7b (patch) | |
| tree | 0ba68cf4b983c56f82ad376881fa4ebf047484d2 /OpenSim/Region | |
| parent | * Allows both old and new OpenSim.ini params for the XmlRpc Groups Service Co... (diff) | |
| parent | change 0.6.9 flavour to post-fixes (diff) | |
| download | opensim-SC-3a8128d30931562f3afdbd929f95d69a8ce4cd7b.zip opensim-SC-3a8128d30931562f3afdbd929f95d69a8ce4cd7b.tar.gz opensim-SC-3a8128d30931562f3afdbd929f95d69a8ce4cd7b.tar.bz2 opensim-SC-3a8128d30931562f3afdbd929f95d69a8ce4cd7b.tar.xz | |
Merge branch '0.6.9-post-fixes' of ssh://justincc@opensimulator.org/var/git/opensim into 0.6.9-post-fixes
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 | ||