aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorSean Dague2009-01-22 16:06:26 +0000
committerSean Dague2009-01-22 16:06:26 +0000
commit54801bb142a2930525d90d9e427c2ee98b673659 (patch)
tree808c6851092e83a50eb5f9b09399fcc3e1b41e32 /OpenSim/Region/Environment/Scenes
parentadding TAGS to .gitignore (diff)
downloadopensim-SC-54801bb142a2930525d90d9e427c2ee98b673659.zip
opensim-SC-54801bb142a2930525d90d9e427c2ee98b673659.tar.gz
opensim-SC-54801bb142a2930525d90d9e427c2ee98b673659.tar.bz2
opensim-SC-54801bb142a2930525d90d9e427c2ee98b673659.tar.xz
* minox fix related to last commit
From: Arthur Rodrigo S Valadares <arthursv@linux.vnet.ibm.com>
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index dfc79b7..4bb1f84 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -2451,16 +2451,17 @@ namespace OpenSim.Region.Environment.Scenes
2451 //Console.WriteLine("BEFORE CROSS"); 2451 //Console.WriteLine("BEFORE CROSS");
2452 //Scene.DumpChildrenSeeds(UUID); 2452 //Scene.DumpChildrenSeeds(UUID);
2453 //DumpKnownRegions(); 2453 //DumpKnownRegions();
2454 2454 string agentcaps;
2455 if (!m_knownChildRegions.ContainsKey(neighbourRegion.RegionHandle)) 2455 if (!m_knownChildRegions.TryGetValue(neighbourRegion.RegionHandle, out agentcaps))
2456 { 2456 {
2457 m_log.ErrorFormat("[SCENE PRESENCE]: No CAPS information for region handle {0}, exiting CrossToNewRegion.", 2457 m_log.ErrorFormat("[SCENE PRESENCE]: No CAPS information for region handle {0}, exiting CrossToNewRegion.",
2458 neighbourRegion.RegionHandle); 2458 neighbourRegion.RegionHandle);
2459 return;
2459 } 2460 }
2460 // TODO Should construct this behind a method 2461 // TODO Should construct this behind a method
2461 string capsPath = 2462 string capsPath =
2462 "http://" + neighbourRegion.ExternalHostName + ":" + neighbourRegion.HttpPort 2463 "http://" + neighbourRegion.ExternalHostName + ":" + neighbourRegion.HttpPort
2463 + "/CAPS/" + m_knownChildRegions[neighbourRegion.RegionHandle] /*circuitdata.CapsPath*/ + "0000/"; 2464 + "/CAPS/" + agentcaps /*circuitdata.CapsPath*/ + "0000/";
2464 2465
2465 m_log.DebugFormat("[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, m_uuid); 2466 m_log.DebugFormat("[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, m_uuid);
2466 2467