From f15ebe9822e684eb827cac7eeb290676f4e69c5a Mon Sep 17 00:00:00 2001
From: UbitUmarov <ajlduarte@sapo.pt>
Date: Thu, 30 Dec 2021 20:43:50 +0000
Subject: [PATCH] (HG)MessageTransferModule: add trivial toAgentID == UUID.Zero
 check again

---
 .../Avatar/InstantMessage/HGMessageTransferModule.cs            | 2 ++
 .../CoreModules/Avatar/InstantMessage/MessageTransferModule.cs  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
index 317da100d8..fafb9f03f7 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
@@ -139,6 +139,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         public void SendInstantMessage(GridInstantMessage im, MessageResultNotification result)
         {
             UUID toAgentID = new UUID(im.toAgentID);
+            if (toAgentID == UUID.Zero)
+                return;
 
             ScenePresence achildsp = null;
             // Try root avatar first
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index a61f890c48..39274fa8c8 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -140,6 +140,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         public virtual void SendInstantMessage(GridInstantMessage im, MessageResultNotification result)
         {
             UUID toAgentID = new UUID(im.toAgentID);
+            if (toAgentID == UUID.Zero)
+                return;
 
             ScenePresence achildsp = null;
             // Try root avatar first