diff options
author | Melanie | 2012-11-15 03:46:10 +0000 |
---|---|---|
committer | Melanie | 2012-11-15 03:46:10 +0000 |
commit | 5895c4cc6f698bcb415b08a96322f06fb44413ca (patch) | |
tree | 5b223f297b27ac3966c65526f422fc82095b9b86 /OpenSim/Region/CoreModules/World/WorldMap | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Improve inventory folder version updating for mssql database plugin. (diff) | |
download | opensim-SC_OLD-5895c4cc6f698bcb415b08a96322f06fb44413ca.zip opensim-SC_OLD-5895c4cc6f698bcb415b08a96322f06fb44413ca.tar.gz opensim-SC_OLD-5895c4cc6f698bcb415b08a96322f06fb44413ca.tar.bz2 opensim-SC_OLD-5895c4cc6f698bcb415b08a96322f06fb44413ca.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World/WorldMap')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs index 0c22279..4c96a50 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 | |||
115 | m_Clients.Add(remoteClient.AgentId); | 115 | m_Clients.Add(remoteClient.AgentId); |
116 | } | 116 | } |
117 | 117 | ||
118 | Util.FireAndForget(delegate | 118 | try |
119 | { | 119 | { |
120 | try | 120 | OnMapNameRequest(remoteClient, mapName, flags); |
121 | { | 121 | } |
122 | OnMapNameRequest(remoteClient, mapName, flags); | 122 | finally |
123 | } | 123 | { |
124 | finally | 124 | lock (m_Clients) |
125 | { | 125 | m_Clients.Remove(remoteClient.AgentId); |
126 | lock (m_Clients) | 126 | } |
127 | m_Clients.Remove(remoteClient.AgentId); | ||
128 | } | ||
129 | }); | ||
130 | |||
131 | } | 127 | } |
132 | 128 | ||
133 | private void OnMapNameRequest(IClientAPI remoteClient, string mapName, uint flags) | 129 | private void OnMapNameRequest(IClientAPI remoteClient, string mapName, uint flags) |