diff options
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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs | 12 |
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 | |||
154 | 154 | ||
155 | ((ISharedRegionModule)m_GridServiceConnector).AddRegion(scene); | 155 | ((ISharedRegionModule)m_GridServiceConnector).AddRegion(scene); |
156 | 156 | ||
157 | // Yikes!! Remove this as soon as user services get refactored | ||
158 | LocalAssetServerURI = scene.CommsManager.NetworkServersInfo.UserURL; | ||
159 | LocalInventoryServerURI = scene.CommsManager.NetworkServersInfo.InventoryURL; | ||
160 | LocalUserServerURI = scene.CommsManager.NetworkServersInfo.UserURL; | ||
161 | HGNetworkServersInfo.Init(LocalAssetServerURI, LocalInventoryServerURI, LocalUserServerURI); | ||
162 | |||
157 | } | 163 | } |
158 | 164 | ||
159 | public void RemoveRegion(Scene scene) | 165 | public void RemoveRegion(Scene scene) |
@@ -173,9 +179,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
173 | if (!m_Initialized) | 179 | if (!m_Initialized) |
174 | { | 180 | { |
175 | m_aScene = scene; | 181 | m_aScene = scene; |
176 | LocalAssetServerURI = m_aScene.CommsManager.NetworkServersInfo.UserURL; | ||
177 | LocalInventoryServerURI = m_aScene.CommsManager.NetworkServersInfo.InventoryURL; | ||
178 | LocalUserServerURI = m_aScene.CommsManager.NetworkServersInfo.UserURL; | ||
179 | 182 | ||
180 | m_HypergridServiceConnector = new HypergridServiceConnector(scene.AssetService); | 183 | m_HypergridServiceConnector = new HypergridServiceConnector(scene.AssetService); |
181 | 184 | ||
@@ -189,9 +192,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
189 | MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "link-mapping", "link-mapping [<x> <y>] <cr>", | 192 | MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "link-mapping", "link-mapping [<x> <y>] <cr>", |
190 | "Set local coordinate to map HG regions to", hgCommands.RunCommand); | 193 | "Set local coordinate to map HG regions to", hgCommands.RunCommand); |
191 | 194 | ||
192 | // Yikes!! Remove this as soon as user services get refactored | ||
193 | HGNetworkServersInfo.Init(LocalAssetServerURI, LocalInventoryServerURI, LocalUserServerURI); | ||
194 | |||
195 | m_Initialized = true; | 195 | m_Initialized = true; |
196 | } | 196 | } |
197 | } | 197 | } |