diff options
| author | Teravus Ovares (Dan Olivares) | 2009-12-12 01:24:25 -0500 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-12-12 01:24:25 -0500 |
| commit | 35961caec6de48ec79e9af79fa1a2edf176b4389 (patch) | |
| tree | 17872ae62dc84525420ff8a248f3eaf8aac6dbba /OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs | |
| parent | * Commit some sit code that's commented out for now. (diff) | |
| parent | Getting rid of SimpleRegionInfo and SerializableRegionInfo per Mel (diff) | |
| download | opensim-SC_OLD-35961caec6de48ec79e9af79fa1a2edf176b4389.zip opensim-SC_OLD-35961caec6de48ec79e9af79fa1a2edf176b4389.tar.gz opensim-SC_OLD-35961caec6de48ec79e9af79fa1a2edf176b4389.tar.bz2 opensim-SC_OLD-35961caec6de48ec79e9af79fa1a2edf176b4389.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs')
| -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); |