From 3bdae01b8f07b3d702ab808db4a10c134cacbf07 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Thu, 23 Jun 2022 18:45:33 +0100 Subject: [PATCH] remove some garbage --- .../CoreModules/Avatar/Chat/ChatModule.cs | 41 +++++++++---------- .../Region/Framework/Scenes/EventManager.cs | 35 ---------------- 2 files changed, 19 insertions(+), 57 deletions(-) diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs index 54bb65e843..315ef01c79 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs @@ -268,8 +268,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat // "[CHAT]: DCTA: fromID {0} fromName {1}, region{2}, cType {3}, sType {4}", // fromID, fromName, scene.RegionInfo.RegionName, c.Type, sourceType); - HashSet receiverIDs = new HashSet(); - if (checkParcelHide) { checkParcelHide = false; @@ -298,7 +296,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat if (TrySendChatMessage(presence, fromPos, regionPos, fromID, ownerID, fromNamePrefix + fromName, c.Type, message, sourceType, destination.IsNotZero())) - receiverIDs.Add(presence.UUID); return; } @@ -314,14 +311,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat { if (TrySendChatMessage(presence, fromPos, regionPos, fromID, ownerID, fromNamePrefix + fromName, c.Type, - message, sourceType, destination.IsNotZero())) - receiverIDs.Add(presence.UUID); + message, sourceType, destination.IsNotZero())); } } }); - - scene.EventManager.TriggerOnChatToClients( - fromID, receiverIDs, message, c.Type, fromPos, fromName, sourceType, ChatAudibleLevel.Fully); } static protected Vector3 CenterOfRegion = new Vector3(128, 128, 30); @@ -330,12 +323,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat { if (c.Channel != 0 && c.Channel != DEBUG_CHANNEL) return; - ChatTypeEnum cType = c.Type; + ChatTypeEnum cType; if (c.Channel == DEBUG_CHANNEL) cType = ChatTypeEnum.DebugChannel; - - if (cType == ChatTypeEnum.Region) + else if (c.Type == ChatTypeEnum.Region) cType = ChatTypeEnum.Say; + else + cType = c.Type; if (c.Message.Length > 1100) c.Message = c.Message.Substring(0, 1000); @@ -344,15 +338,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat // message to each avatar in the scene. string fromName = c.From; - UUID fromID = UUID.Zero; - UUID ownerID = UUID.Zero; + UUID fromID; + UUID ownerID; ChatSourceType sourceType = ChatSourceType.Object; if (null != c.Sender) { ScenePresence avatar = (c.Scene as Scene).GetScenePresence(c.Sender.AgentId); fromID = c.Sender.AgentId; fromName = avatar.Name; - ownerID = c.Sender.AgentId; + ownerID = UUID.Zero; sourceType = ChatSourceType.Agent; } else if (c.SenderUUID.IsNotZero()) @@ -361,14 +355,20 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat return; fromID = c.SenderUUID; ownerID = ((SceneObjectPart)c.SenderObject).OwnerID; + sourceType = ChatSourceType.Object; + } + else + { + sourceType = ChatSourceType.Object; + fromID = UUID.Zero; + ownerID = UUID.Zero; } // m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType); - HashSet receiverIDs = new HashSet(); - - if (c.Scene != null) + Scene scene = c.Scene as Scene; + if (scene != null) { - ((Scene)c.Scene).ForEachRootClient + scene.ForEachRootClient ( delegate(IClientAPI client) { @@ -379,13 +379,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat (((SceneObjectPart)c.SenderObject).OwnerID.NotEqual(client.AgentId))) return; - client.SendChatMessage(c.Message, (byte)cType, CenterOfRegion, fromName, fromID, fromID, + client.SendChatMessage(c.Message, (byte)cType, CenterOfRegion, fromName, fromID, ownerID, (byte)sourceType, (byte)ChatAudibleLevel.Fully); - receiverIDs.Add(client.AgentId); } ); - (c.Scene as Scene).EventManager.TriggerOnChatToClients( - fromID, receiverIDs, c.Message, cType, CenterOfRegion, fromName, sourceType, ChatAudibleLevel.Fully); } } diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index 7ac2bff49f..cb3eeb3f05 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs @@ -842,17 +842,6 @@ namespace OpenSim.Region.Framework.Scenes public delegate void ChatFromClientEvent(Object sender, OSChatMessage chat); public event ChatFromClientEvent OnChatFromClient; - /// - /// ChatToClientsEvent is triggered via ChatModule (or - /// substitutes thereof) when a chat message is actually sent to clients. Clients will only be sent a - /// received chat message if they satisfy various conditions (within audible range, etc.) - /// - public delegate void ChatToClientsEvent( - UUID senderID, HashSet receiverIDs, - string message, ChatTypeEnum type, Vector3 fromPos, string fromName, - ChatSourceType src, ChatAudibleLevel level); - public event ChatToClientsEvent OnChatToClients; - /// /// ChatBroadcastEvent is called via Scene when a broadcast chat message /// from world comes in @@ -2471,30 +2460,6 @@ namespace OpenSim.Region.Framework.Scenes } } - public void TriggerOnChatToClients( - UUID senderID, HashSet receiverIDs, - string message, ChatTypeEnum type, Vector3 fromPos, string fromName, - ChatSourceType src, ChatAudibleLevel level) - { - ChatToClientsEvent handler = OnChatToClients; - if (handler != null) - { - foreach (ChatToClientsEvent d in handler.GetInvocationList()) - { - try - { - d(senderID, receiverIDs, message, type, fromPos, fromName, src, level); - } - catch (Exception e) - { - m_log.ErrorFormat( - "[EVENT MANAGER]: Delegate for TriggerOnChatToClients failed - continuing. {0} {1}", - e.Message, e.StackTrace); - } - } - } - } - public void TriggerOnChatBroadcast(Object sender, OSChatMessage chat) { ChatBroadcastEvent handlerChatBroadcast = OnChatBroadcast;