diff options
author | Melanie | 2009-12-12 04:14:12 +0000 |
---|---|---|
committer | Melanie | 2009-12-12 04:14:12 +0000 |
commit | 83ca7db4b85641b8bfbfeab6cb9b1c3157fcf67f (patch) | |
tree | a3b7f1def00f4365254b3e5c3c6eebd0a0c6c7a9 /OpenSim/Region/CoreModules | |
parent | Getting rid of a bunch of old classes, that are likely left over from the ROB... (diff) | |
parent | A few more guards along the path to user server. (diff) | |
download | opensim-SC_OLD-83ca7db4b85641b8bfbfeab6cb9b1c3157fcf67f.zip opensim-SC_OLD-83ca7db4b85641b8bfbfeab6cb9b1c3157fcf67f.tar.gz opensim-SC_OLD-83ca7db4b85641b8bfbfeab6cb9b1c3157fcf67f.tar.bz2 opensim-SC_OLD-83ca7db4b85641b8bfbfeab6cb9b1c3157fcf67f.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs index f2d8579..4d347cd 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs | |||
@@ -155,7 +155,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
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 | 157 | // Yikes!! Remove this as soon as user services get refactored |
158 | LocalAssetServerURI = scene.CommsManager.NetworkServersInfo.UserURL; | 158 | LocalAssetServerURI = scene.CommsManager.NetworkServersInfo.AssetURL; |
159 | LocalInventoryServerURI = scene.CommsManager.NetworkServersInfo.InventoryURL; | 159 | LocalInventoryServerURI = scene.CommsManager.NetworkServersInfo.InventoryURL; |
160 | LocalUserServerURI = scene.CommsManager.NetworkServersInfo.UserURL; | 160 | LocalUserServerURI = scene.CommsManager.NetworkServersInfo.UserURL; |
161 | HGNetworkServersInfo.Init(LocalAssetServerURI, LocalInventoryServerURI, LocalUserServerURI); | 161 | HGNetworkServersInfo.Init(LocalAssetServerURI, LocalInventoryServerURI, LocalUserServerURI); |