diff options
author | Diva Canto | 2009-09-26 08:49:48 -0700 |
---|---|---|
committer | Diva Canto | 2009-09-26 08:49:48 -0700 |
commit | 632bb7126277b6e8b524b76fb181a079b51adcf4 (patch) | |
tree | a9efec379c4eb9c8ff5abf5efaab9a6fcbf96271 /OpenSim/Region/Framework | |
parent | More redirects to HGGridConnector-as-HyperlinkService. (diff) | |
download | opensim-SC_OLD-632bb7126277b6e8b524b76fb181a079b51adcf4.zip opensim-SC_OLD-632bb7126277b6e8b524b76fb181a079b51adcf4.tar.gz opensim-SC_OLD-632bb7126277b6e8b524b76fb181a079b51adcf4.tar.bz2 opensim-SC_OLD-632bb7126277b6e8b524b76fb181a079b51adcf4.tar.xz |
Fixed MapBlocks bug, wrong order of arguments. First version that seems completely functional.
Also fixed the notification of the message server in standalone -- that server doesn't usually exist.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index d0b0f01..9071701 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
@@ -371,15 +371,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
371 | string capsPath = "http://" + reg.ExternalHostName + ":" + reg.HttpPort | 371 | string capsPath = "http://" + reg.ExternalHostName + ":" + reg.HttpPort |
372 | + "/CAPS/" + a.CapsPath + "0000/"; | 372 | + "/CAPS/" + a.CapsPath + "0000/"; |
373 | 373 | ||
374 | m_log.DebugFormat("[XXX] CAPS = {0}", capsPath); | ||
375 | m_log.DebugFormat("[XXX] ExternalEndPoint = {0}", endPoint.ToString()); | ||
376 | |||
377 | string reason = String.Empty; | 374 | string reason = String.Empty; |
378 | 375 | ||
379 | //bool regionAccepted = m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, a); | 376 | |
380 | |||
381 | bool regionAccepted = m_interregionCommsOut.SendCreateChildAgent(reg.RegionHandle, a, out reason); | 377 | bool regionAccepted = m_interregionCommsOut.SendCreateChildAgent(reg.RegionHandle, a, out reason); |
382 | m_log.DebugFormat("[XXX] Here 1 {0}", regionAccepted); | ||
383 | 378 | ||
384 | if (regionAccepted && newAgent) | 379 | if (regionAccepted && newAgent) |
385 | { | 380 | { |
@@ -394,7 +389,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
394 | } | 389 | } |
395 | #endregion | 390 | #endregion |
396 | 391 | ||
397 | m_log.DebugFormat("[XXX] HERE 2"); | ||
398 | eq.EnableSimulator(reg.RegionHandle, endPoint, avatar.UUID); | 392 | eq.EnableSimulator(reg.RegionHandle, endPoint, avatar.UUID); |
399 | eq.EstablishAgentCommunication(avatar.UUID, endPoint, capsPath); | 393 | eq.EstablishAgentCommunication(avatar.UUID, endPoint, capsPath); |
400 | m_log.DebugFormat("[CAPS]: Sending new CAPS seed url {0} to client {1} in region {2}", | 394 | m_log.DebugFormat("[CAPS]: Sending new CAPS seed url {0} to client {1} in region {2}", |