diff options
author | Melanie | 2012-07-06 20:51:18 +0100 |
---|---|---|
committer | Melanie | 2012-07-06 20:51:18 +0100 |
commit | 26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2 (patch) | |
tree | bf9802d765a4965dd1b42c4b2d3145b5813c0c1f /OpenSim/Region/CoreModules/Avatar | |
parent | Merge branch 'master' into careminster (diff) | |
parent | added llSetVelocity. will refuse to work on vehicles and on attachments ( th... (diff) | |
download | opensim-SC_OLD-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.zip opensim-SC_OLD-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.tar.gz opensim-SC_OLD-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.tar.bz2 opensim-SC_OLD-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.tar.xz |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-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 bc42fd1..dbbb0ae 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | |||
@@ -351,9 +351,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
351 | UUID fromAgentID, string fromName, ChatTypeEnum type, | 351 | UUID fromAgentID, string fromName, ChatTypeEnum type, |
352 | string message, ChatSourceType src) | 352 | string message, ChatSourceType src) |
353 | { | 353 | { |
354 | // don't send llRegionSay to child agents. Send normal chat because you | 354 | // don't send chat to child agents |
355 | // can't talk across sim borders if it's not done | 355 | if (presence.IsChildAgent) return false; |
356 | if (type == ChatTypeEnum.Broadcast && presence.IsChildAgent) return false; | ||
357 | 356 | ||
358 | Vector3 fromRegionPos = fromPos + regionPos; | 357 | Vector3 fromRegionPos = fromPos + regionPos; |
359 | Vector3 toRegionPos = presence.AbsolutePosition + | 358 | Vector3 toRegionPos = presence.AbsolutePosition + |