From e15ebc091f19634d0d50d63b0dd6bc7179a09ee5 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 17 Nov 2015 01:31:06 +0000 Subject: [PATCH] bug fix: improve chat to child avatars. Still not good because of low resolution of child position updates --- .../CoreModules/Avatar/Chat/ChatModule.cs | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs index d83713b5a4..fd6202a352 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs @@ -310,18 +310,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat } if (c.Sender == null || Presencecheck.IsEitherBannedOrRestricted(c.Sender.AgentId) != true) { - if (destination != UUID.Zero) - { - if (TrySendChatMessage(presence, fromPos, regionPos, fromID, ownerID, fromNamePrefix + fromName, c.Type, message, sourceType, true)) - receiverIDs.Add(presence.UUID); - } - else - { - if (TrySendChatMessage(presence, fromPos, regionPos, fromID, ownerID, fromNamePrefix + fromName, c.Type, message, sourceType, false)) - receiverIDs.Add(presence.UUID); - } + if (TrySendChatMessage(presence, fromPos, regionPos, fromID, + ownerID, fromNamePrefix + fromName, c.Type, + message, sourceType, (destination != UUID.Zero))) + receiverIDs.Add(presence.UUID); } } + else if(!checkParcelHide && (presence.IsChildAgent)) + { + if (TrySendChatMessage(presence, fromPos, regionPos, fromID, + ownerID, fromNamePrefix + fromName, c.Type, + message, sourceType, (destination != UUID.Zero))) + receiverIDs.Add(presence.UUID); + } } ); }