From 9704196bbf54475bbf092e91cc6f7bdd8ed27f14 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Thu, 22 Jan 2009 13:59:54 +0000 Subject: [PATCH] * Caught 2 dictionary exceptions that were unhandled From: Arthur Rodrigo S Valadares --- .../Modules/Agent/Capabilities/CapabilitiesModule.cs | 4 +++- OpenSim/Region/Environment/Scenes/ScenePresence.cs | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs index 9fa6d7d144..838851ca92 100644 --- a/OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs @@ -175,9 +175,11 @@ namespace OpenSim.Region.Environment.Modules.Agent.Capabilities public string GetChildSeed(UUID agentID, ulong handle) { Dictionary seeds; + string returnval; if (childrenSeeds.TryGetValue(agentID, out seeds)) { - return seeds[handle]; + if (seeds.TryGetValue(handle, out returnval)) + return returnval; } return null; } diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 02d3642b75..dfc79b78c7 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs @@ -2452,6 +2452,11 @@ namespace OpenSim.Region.Environment.Scenes //Scene.DumpChildrenSeeds(UUID); //DumpKnownRegions(); + if (!m_knownChildRegions.ContainsKey(neighbourRegion.RegionHandle)) + { + m_log.ErrorFormat("[SCENE PRESENCE]: No CAPS information for region handle {0}, exiting CrossToNewRegion.", + neighbourRegion.RegionHandle); + } // TODO Should construct this behind a method string capsPath = "http://" + neighbourRegion.ExternalHostName + ":" + neighbourRegion.HttpPort