From df4da51f04ea2900032a6bd2749039bee5338f54 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 15 Nov 2012 03:04:46 +0000
Subject: 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
---
 .../CoreModules/World/WorldMap/MapSearchModule.cs    | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'OpenSim/Region/CoreModules')

diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index 46b190e..708a9a2 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -115,19 +115,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)
-- 
cgit v1.1