diff options
Diffstat (limited to '')
3 files changed, 25 insertions, 21 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs index 56545d6..0c6900d 100644 --- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs +++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs | |||
@@ -210,7 +210,7 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities | |||
210 | 210 | ||
211 | public void SetChildrenSeed(UUID agentID, Dictionary<ulong, string> seeds) | 211 | public void SetChildrenSeed(UUID agentID, Dictionary<ulong, string> seeds) |
212 | { | 212 | { |
213 | //m_log.Debug(" !!! Setting child seeds in {0} to {1}", RegionInfo.RegionName, value.Count); | 213 | //m_log.DebugFormat(" !!! Setting child seeds in {0} to {1}", m_scene.RegionInfo.RegionName, seeds.Count); |
214 | childrenSeeds[agentID] = seeds; | 214 | childrenSeeds[agentID] = seeds; |
215 | } | 215 | } |
216 | 216 | ||
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs index 8230401..34d46a0 100644 --- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs | |||
@@ -328,15 +328,19 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue | |||
328 | 328 | ||
329 | public bool HasEvents(UUID agentID) | 329 | public bool HasEvents(UUID agentID) |
330 | { | 330 | { |
331 | Queue<OSD> queue = TryGetQueue(agentID); | 331 | // Don't use this, because of race conditions at agent closing time |
332 | lock (queue) | 332 | //Queue<OSD> queue = TryGetQueue(agentID); |
333 | { | ||
334 | if (queue.Count > 0) | ||
335 | return true; | ||
336 | else | ||
337 | return false; | ||
338 | } | ||
339 | 333 | ||
334 | Queue<OSD> queue = GetQueue(agentID); | ||
335 | if (queue != null) | ||
336 | lock (queue) | ||
337 | { | ||
338 | if (queue.Count > 0) | ||
339 | return true; | ||
340 | else | ||
341 | return false; | ||
342 | } | ||
343 | return false; | ||
340 | } | 344 | } |
341 | 345 | ||
342 | public Hashtable GetEvents(UUID pAgentId, string request) | 346 | public Hashtable GetEvents(UUID pAgentId, string request) |
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index 4f2b6ec..0140faa 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
@@ -1319,17 +1319,17 @@ namespace OpenSim.Region.Framework.Scenes | |||
1319 | return m_commsProvider.GridService.RequestNamedRegions(name, maxNumber); | 1319 | return m_commsProvider.GridService.RequestNamedRegions(name, maxNumber); |
1320 | } | 1320 | } |
1321 | 1321 | ||
1322 | // private void Dump(string msg, List<ulong> handles) | 1322 | //private void Dump(string msg, List<ulong> handles) |
1323 | // { | 1323 | //{ |
1324 | // m_log.Info"-------------- HANDLE DUMP ({0}) ---------", msg); | 1324 | // m_log.InfoFormat("-------------- HANDLE DUMP ({0}) ---------", msg); |
1325 | // foreach (ulong handle in handles) | 1325 | // foreach (ulong handle in handles) |
1326 | // { | 1326 | // { |
1327 | // uint x, y; | 1327 | // uint x, y; |
1328 | // Utils.LongToUInts(handle, out x, out y); | 1328 | // Utils.LongToUInts(handle, out x, out y); |
1329 | // x = x / Constants.RegionSize; | 1329 | // x = x / Constants.RegionSize; |
1330 | // y = y / Constants.RegionSize; | 1330 | // y = y / Constants.RegionSize; |
1331 | // m_log.Info("({0}, {1})", x, y); | 1331 | // m_log.InfoFormat("({0}, {1})", x, y); |
1332 | // } | 1332 | // } |
1333 | // } | 1333 | //} |
1334 | } | 1334 | } |
1335 | } | 1335 | } |