From 38d2d6a20cb56603ed732e1a2e6a0afe9f4972dd Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Thu, 15 Nov 2012 03:04:46 +0000
Subject: [PATCH] Following on from 4f982596, launch map name requests on an
 async thread from LLClientView directly.

This releases the inbound packet handling thread marginally quicker and is more consistent with the other async packet handling
---
 .../ClientStack/Linden/UDP/LLClientView.cs    |  2 +-
 .../World/WorldMap/MapSearchModule.cs         | 20 ++++++++-----------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index eadc41effa..03cffafe03 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5321,7 +5321,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             AddLocalPacketHandler(PacketType.RezScript, HandleRezScript);
             AddLocalPacketHandler(PacketType.MapLayerRequest, HandleMapLayerRequest, false);
             AddLocalPacketHandler(PacketType.MapBlockRequest, HandleMapBlockRequest, false);
-            AddLocalPacketHandler(PacketType.MapNameRequest, HandleMapNameRequest, false);
+            AddLocalPacketHandler(PacketType.MapNameRequest, HandleMapNameRequest);
             AddLocalPacketHandler(PacketType.TeleportLandmarkRequest, HandleTeleportLandmarkRequest);
             AddLocalPacketHandler(PacketType.TeleportCancel, HandleTeleportCancel);
             AddLocalPacketHandler(PacketType.TeleportLocationRequest, HandleTeleportLocationRequest);
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index 398c43e608..f7ea76aedf 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -96,19 +96,15 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 m_Clients.Add(remoteClient.AgentId);
             }
 
-            Util.FireAndForget(delegate
+            try
             {
-                try
-                {
-                    OnMapNameRequest(remoteClient, mapName, flags);
-                }
-                finally
-                {
-                    lock (m_Clients)
-                        m_Clients.Remove(remoteClient.AgentId);
-                }
-            });
-
+                OnMapNameRequest(remoteClient, mapName, flags);
+            }
+            finally
+            {
+                lock (m_Clients)
+                    m_Clients.Remove(remoteClient.AgentId);
+            }
         }
 
         private void OnMapNameRequest(IClientAPI remoteClient, string mapName, uint flags)