diff options
| author | Melanie | 2012-06-29 01:02:22 +0200 |
|---|---|---|
| committer | Melanie | 2012-06-29 01:02:22 +0200 |
| commit | 0d26e271c9a60d959b643500a83aee3e67c4d035 (patch) | |
| tree | 1c196763df9ade5898ed0cce4db38506e17788a7 /OpenSim/Region | |
| parent | Merge branch 'ubitwork' into avination (diff) | |
| download | opensim-SC-0d26e271c9a60d959b643500a83aee3e67c4d035.zip opensim-SC-0d26e271c9a60d959b643500a83aee3e67c4d035.tar.gz opensim-SC-0d26e271c9a60d959b643500a83aee3e67c4d035.tar.bz2 opensim-SC-0d26e271c9a60d959b643500a83aee3e67c4d035.tar.xz | |
stop chat being sent to child avs again.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs index 357c2af..6215526 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | |||
| @@ -352,9 +352,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
| 352 | UUID fromAgentID, string fromName, ChatTypeEnum type, | 352 | UUID fromAgentID, string fromName, ChatTypeEnum type, |
| 353 | string message, ChatSourceType src) | 353 | string message, ChatSourceType src) |
| 354 | { | 354 | { |
| 355 | // don't send llRegionSay to child agents. Send normal chat because you | 355 | // don't send chat to child agents |
| 356 | // can't talk across sim borders if it's not done | 356 | if (presence.IsChildAgent) return false; |
| 357 | if (type == ChatTypeEnum.Broadcast && presence.IsChildAgent) return false; | ||
| 358 | 357 | ||
| 359 | Vector3 fromRegionPos = fromPos + regionPos; | 358 | Vector3 fromRegionPos = fromPos + regionPos; |
| 360 | Vector3 toRegionPos = presence.AbsolutePosition + | 359 | Vector3 toRegionPos = presence.AbsolutePosition + |