From 5752c1f5c2ee069e2ff5ffc0ff2f186d7454c5c4 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Wed, 28 May 2008 03:44:49 +0000 Subject: Formatting cleanup. --- .../Environment/Modules/Avatar/Chat/ChatModule.cs | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs') diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs index 89437c5..5414322 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs @@ -122,24 +122,24 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat IClientAPI client = presence.ControllingClient; - if ((c.Type == ChatTypeEnum.Owner) && - (null != c.SenderObject) && + if ((c.Type == ChatTypeEnum.Owner) && + (null != c.SenderObject) && (((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId)) return; - + if (null == c.SenderObject) - client.SendChatMessage(c.Message, (byte)c.Type, - pos, c.From, LLUUID.Zero, + client.SendChatMessage(c.Message, (byte)c.Type, + pos, c.From, LLUUID.Zero, (byte)ChatSourceType.Agent, (byte)ChatAudibleLevel.Fully); else - client.SendChatMessage(c.Message, (byte)c.Type, - pos, c.From, LLUUID.Zero, + client.SendChatMessage(c.Message, (byte)c.Type, + pos, c.From, LLUUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully); }); } - + public void SimChat(Object sender, ChatFromViewerArgs e) { // early return if not on public or debug channel @@ -187,13 +187,13 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat if (e.Channel == DEBUG_CHANNEL) { TrySendChatMessage(presence, fromPos, regionPos, - fromID, fromName, e.Type, + fromID, fromName, e.Type, message, ChatSourceType.Object); } else { TrySendChatMessage(presence, fromPos, regionPos, - fromID, fromName, e.Type, + fromID, fromName, e.Type, message, ChatSourceType.Agent); } }); @@ -224,16 +224,16 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat LLVector3 fromRegionPos = fromPos + regionPos; LLVector3 toRegionPos = presence.AbsolutePosition + regionPos; int dis = Math.Abs((int) Util.GetDistanceTo(toRegionPos, fromRegionPos)); - + if (type == ChatTypeEnum.Whisper && dis > m_whisperdistance || type == ChatTypeEnum.Say && dis > m_saydistance || type == ChatTypeEnum.Shout && dis > m_shoutdistance) { return; } - + // TODO: should change so the message is sent through the avatar rather than direct to the ClientView - presence.ControllingClient.SendChatMessage(message, (byte) type, fromPos, fromName, + presence.ControllingClient.SendChatMessage(message, (byte) type, fromPos, fromName, fromAgentID,(byte)src,(byte)ChatAudibleLevel.Fully); } } -- cgit v1.1