ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 10:15:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

NetworkServersInfo removed from CommsManager.

Browse Source
This commit is contained in:
Diva Canto
2010-01-10 21:37:36 -08:00
parent cddd48aeea
commit 751e70af78
11 changed files with 31 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
View File

@@ -155,12 +155,6 @@ 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.AssetURL;
LocalInventoryServerURI = scene.CommsManager.NetworkServersInfo.InventoryURL;
LocalUserServerURI = scene.CommsManager.NetworkServersInfo.UserURL;
HGNetworkServersInfo.Init(LocalAssetServerURI, LocalInventoryServerURI, LocalUserServerURI);
}
public void RemoveRegion(Scene scene)
@@ -760,7 +754,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
protected bool IsComingHome(ForeignUserProfileData userData)
{
return (userData.UserServerURI == LocalUserServerURI);
return false;
// REFACTORING PROBLEM
//return (userData.UserServerURI == LocalUserServerURI);
}
// REFACTORING PROBLEM
@@ -787,13 +783,16 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
protected bool IsLocalUser(UserAccount account)
{
if (account != null &&
account.ServiceURLs.ContainsKey("HomeURI") &&
account.ServiceURLs["HomeURI"] != null)
return true;
return (account.ServiceURLs["HomeURI"].ToString() == LocalUserServerURI);
// REFACTORING PROBLEM
//if (account != null &&
// account.ServiceURLs.ContainsKey("HomeURI") &&
// account.ServiceURLs["HomeURI"] != null)
return false;
// return (account.ServiceURLs["HomeURI"].ToString() == LocalUserServerURI);
//return false;
}

8
OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
View File

@@ -61,9 +61,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
{
get
{
if (m_LocalGridInventoryURI == null || m_LocalGridInventoryURI == "")
m_LocalGridInventoryURI = m_Scene.CommsManager.NetworkServersInfo.InventoryURL;
return m_LocalGridInventoryURI;
return string.Empty;
// REFACTORING PROBLEM
//if (m_LocalGridInventoryURI == null || m_LocalGridInventoryURI == "")
// m_LocalGridInventoryURI = m_Scene.CommsManager.NetworkServersInfo.InventoryURL;
//return m_LocalGridInventoryURI;
}
}