aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar
diff options
context:
space:
mode:
authorUbitUmarov2015-11-17 01:31:06 +0000
committerUbitUmarov2015-11-17 01:31:06 +0000
commite15ebc091f19634d0d50d63b0dd6bc7179a09ee5 (patch)
tree5b4526bc5005225503c04a3543df0208d807fa6f /OpenSim/Region/CoreModules/Avatar
parent bug fix: StateSource of a SOG that is not a attachment is StateSource.PrimCr... (diff)
downloadopensim-SC-e15ebc091f19634d0d50d63b0dd6bc7179a09ee5.zip
opensim-SC-e15ebc091f19634d0d50d63b0dd6bc7179a09ee5.tar.gz
opensim-SC-e15ebc091f19634d0d50d63b0dd6bc7179a09ee5.tar.bz2
opensim-SC-e15ebc091f19634d0d50d63b0dd6bc7179a09ee5.tar.xz
bug fix: improve chat to child avatars. Still not good because of low resolution of child position updates
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs21
1 files changed, 11 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index d83713b..fd6202a 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
310 } 310 }
311 if (c.Sender == null || Presencecheck.IsEitherBannedOrRestricted(c.Sender.AgentId) != true) 311 if (c.Sender == null || Presencecheck.IsEitherBannedOrRestricted(c.Sender.AgentId) != true)
312 { 312 {
313 if (destination != UUID.Zero) 313 if (TrySendChatMessage(presence, fromPos, regionPos, fromID,
314 { 314 ownerID, fromNamePrefix + fromName, c.Type,
315 if (TrySendChatMessage(presence, fromPos, regionPos, fromID, ownerID, fromNamePrefix + fromName, c.Type, message, sourceType, true)) 315 message, sourceType, (destination != UUID.Zero)))
316 receiverIDs.Add(presence.UUID); 316 receiverIDs.Add(presence.UUID);
317 }
318 else
319 {
320 if (TrySendChatMessage(presence, fromPos, regionPos, fromID, ownerID, fromNamePrefix + fromName, c.Type, message, sourceType, false))
321 receiverIDs.Add(presence.UUID);
322 }
323 } 317 }
324 } 318 }
319 else if(!checkParcelHide && (presence.IsChildAgent))
320 {
321 if (TrySendChatMessage(presence, fromPos, regionPos, fromID,
322 ownerID, fromNamePrefix + fromName, c.Type,
323 message, sourceType, (destination != UUID.Zero)))
324 receiverIDs.Add(presence.UUID);
325 }
325 } 326 }
326 ); 327 );
327 } 328 }