Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

1 files changed, 6 insertions, 6 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
index 1422add..046bee5 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 [<x> <y>] <cr>",
                     "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;
             }
         }