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 | |
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 '')
4 files changed, 16 insertions, 11 deletions
diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs index 3b00af3..7e66742 100644 --- a/OpenSim/Framework/NetworkServersInfo.cs +++ b/OpenSim/Framework/NetworkServersInfo.cs | |||
@@ -102,8 +102,7 @@ namespace OpenSim.Framework | |||
102 | ConfigSettings.DefaultInventoryServerHttpPort.ToString()); | 102 | ConfigSettings.DefaultInventoryServerHttpPort.ToString()); |
103 | secureInventoryServer = config.Configs["Network"].GetBoolean("secure_inventory_server", true); | 103 | secureInventoryServer = config.Configs["Network"].GetBoolean("secure_inventory_server", true); |
104 | 104 | ||
105 | MessagingURL = config.Configs["Network"].GetString("messaging_server_url", | 105 | MessagingURL = config.Configs["Network"].GetString("messaging_server_url", string.Empty); |
106 | "http://127.0.0.1:" + ConfigSettings.DefaultMessageServerHttpPort); | ||
107 | } | 106 | } |
108 | } | 107 | } |
109 | } | 108 | } |
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs index 6daab44..5a9b452 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs | |||
@@ -330,6 +330,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
330 | 330 | ||
331 | private void NotifyMessageServerOfStartup(Scene scene) | 331 | private void NotifyMessageServerOfStartup(Scene scene) |
332 | { | 332 | { |
333 | if (m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL == string.Empty) | ||
334 | return; | ||
335 | |||
333 | Hashtable xmlrpcdata = new Hashtable(); | 336 | Hashtable xmlrpcdata = new Hashtable(); |
334 | xmlrpcdata["RegionUUID"] = scene.RegionInfo.RegionID.ToString(); | 337 | xmlrpcdata["RegionUUID"] = scene.RegionInfo.RegionID.ToString(); |
335 | ArrayList SendParams = new ArrayList(); | 338 | ArrayList SendParams = new ArrayList(); |
@@ -353,6 +356,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
353 | 356 | ||
354 | private void NotifyMessageServerOfShutdown(Scene scene) | 357 | private void NotifyMessageServerOfShutdown(Scene scene) |
355 | { | 358 | { |
359 | if (m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL == string.Empty) | ||
360 | return; | ||
361 | |||
356 | Hashtable xmlrpcdata = new Hashtable(); | 362 | Hashtable xmlrpcdata = new Hashtable(); |
357 | xmlrpcdata["RegionUUID"] = scene.RegionInfo.RegionID.ToString(); | 363 | xmlrpcdata["RegionUUID"] = scene.RegionInfo.RegionID.ToString(); |
358 | ArrayList SendParams = new ArrayList(); | 364 | ArrayList SendParams = new ArrayList(); |
@@ -376,6 +382,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
376 | 382 | ||
377 | private void NotifyMessageServerOfAgentLocation(UUID agentID, UUID region, ulong regionHandle) | 383 | private void NotifyMessageServerOfAgentLocation(UUID agentID, UUID region, ulong regionHandle) |
378 | { | 384 | { |
385 | if (m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL == string.Empty) | ||
386 | return; | ||
387 | |||
379 | Hashtable xmlrpcdata = new Hashtable(); | 388 | Hashtable xmlrpcdata = new Hashtable(); |
380 | xmlrpcdata["AgentID"] = agentID.ToString(); | 389 | xmlrpcdata["AgentID"] = agentID.ToString(); |
381 | xmlrpcdata["RegionUUID"] = region.ToString(); | 390 | xmlrpcdata["RegionUUID"] = region.ToString(); |
@@ -401,6 +410,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
401 | 410 | ||
402 | private void NotifyMessageServerOfAgentLeaving(UUID agentID, UUID region, ulong regionHandle) | 411 | private void NotifyMessageServerOfAgentLeaving(UUID agentID, UUID region, ulong regionHandle) |
403 | { | 412 | { |
413 | if (m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL == string.Empty) | ||
414 | return; | ||
415 | |||
404 | Hashtable xmlrpcdata = new Hashtable(); | 416 | Hashtable xmlrpcdata = new Hashtable(); |
405 | xmlrpcdata["AgentID"] = agentID.ToString(); | 417 | xmlrpcdata["AgentID"] = agentID.ToString(); |
406 | xmlrpcdata["RegionUUID"] = region.ToString(); | 418 | xmlrpcdata["RegionUUID"] = region.ToString(); |
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs index 9957e46..a0ccdc7 100644 --- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs +++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs | |||
@@ -62,8 +62,8 @@ namespace OpenSim.Region.CoreModules.Hypergrid | |||
62 | { | 62 | { |
63 | List<MapBlockData> mapBlocks = new List<MapBlockData>(); | 63 | List<MapBlockData> mapBlocks = new List<MapBlockData>(); |
64 | List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, | 64 | List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, |
65 | (minX - 4) * (int)Constants.RegionSize, (minY - 4) * (int)Constants.RegionSize, | 65 | (minX - 4) * (int)Constants.RegionSize, (maxX + 4) * (int)Constants.RegionSize, |
66 | (maxX + 4) * (int)Constants.RegionSize, (maxY + 4) * (int)Constants.RegionSize); | 66 | (minY - 4) * (int)Constants.RegionSize, (maxY + 4) * (int)Constants.RegionSize); |
67 | 67 | ||
68 | foreach (GridRegion r in regions) | 68 | foreach (GridRegion r in regions) |
69 | { | 69 | { |
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}", |