From cd321ec4d2f1f7834fb52a6e7d0a853600d8a612 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Wed, 14 Oct 2009 19:15:11 -0700 Subject: [PATCH] Moved some code up to AddRegion, so that other modules that depend on it don't crash. This code needs to be removed as soon as user services is refactored. --- .../ServiceConnectorsOut/Grid/HGGridConnector.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs index 1422addce0..046bee5b63 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs @@ -154,6 +154,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid ((ISharedRegionModule)m_GridServiceConnector).AddRegion(scene); + // Yikes!! Remove this as soon as user services get refactored + LocalAssetServerURI = scene.CommsManager.NetworkServersInfo.UserURL; + LocalInventoryServerURI = scene.CommsManager.NetworkServersInfo.InventoryURL; + LocalUserServerURI = scene.CommsManager.NetworkServersInfo.UserURL; + HGNetworkServersInfo.Init(LocalAssetServerURI, LocalInventoryServerURI, LocalUserServerURI); + } public void RemoveRegion(Scene scene) @@ -173,9 +179,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid if (!m_Initialized) { m_aScene = scene; - LocalAssetServerURI = m_aScene.CommsManager.NetworkServersInfo.UserURL; - LocalInventoryServerURI = m_aScene.CommsManager.NetworkServersInfo.InventoryURL; - LocalUserServerURI = m_aScene.CommsManager.NetworkServersInfo.UserURL; m_HypergridServiceConnector = new HypergridServiceConnector(scene.AssetService); @@ -189,9 +192,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "link-mapping", "link-mapping [ ] ", "Set local coordinate to map HG regions to", hgCommands.RunCommand); - // Yikes!! Remove this as soon as user services get refactored - HGNetworkServersInfo.Init(LocalAssetServerURI, LocalInventoryServerURI, LocalUserServerURI); - m_Initialized = true; } }