aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs5
2 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs
index 9fa6d7d..838851c 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
175 public string GetChildSeed(UUID agentID, ulong handle) 175 public string GetChildSeed(UUID agentID, ulong handle)
176 { 176 {
177 Dictionary<ulong, string> seeds; 177 Dictionary<ulong, string> seeds;
178 string returnval;
178 if (childrenSeeds.TryGetValue(agentID, out seeds)) 179 if (childrenSeeds.TryGetValue(agentID, out seeds))
179 { 180 {
180 return seeds[handle]; 181 if (seeds.TryGetValue(handle, out returnval))
182 return returnval;
181 } 183 }
182 return null; 184 return null;
183 } 185 }
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 02d3642..dfc79b7 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -2452,6 +2452,11 @@ namespace OpenSim.Region.Environment.Scenes
2452 //Scene.DumpChildrenSeeds(UUID); 2452 //Scene.DumpChildrenSeeds(UUID);
2453 //DumpKnownRegions(); 2453 //DumpKnownRegions();
2454 2454
2455 if (!m_knownChildRegions.ContainsKey(neighbourRegion.RegionHandle))
2456 {
2457 m_log.ErrorFormat("[SCENE PRESENCE]: No CAPS information for region handle {0}, exiting CrossToNewRegion.",
2458 neighbourRegion.RegionHandle);
2459 }
2455 // TODO Should construct this behind a method 2460 // TODO Should construct this behind a method
2456 string capsPath = 2461 string capsPath =
2457 "http://" + neighbourRegion.ExternalHostName + ":" + neighbourRegion.HttpPort 2462 "http://" + neighbourRegion.ExternalHostName + ":" + neighbourRegion.HttpPort