diff options
author | Diva Canto | 2010-01-10 21:37:36 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-10 21:37:36 -0800 |
commit | 751e70af788bf27fa0401c25d899f73186c8eafa (patch) | |
tree | 4790d180a9986c41e52c9910790565ac80fb40db /OpenSim/Region/CoreModules/ServiceConnectorsOut | |
parent | Some more unnecessary things deleted in Framework.Communications. (diff) | |
download | opensim-SC_OLD-751e70af788bf27fa0401c25d899f73186c8eafa.zip opensim-SC_OLD-751e70af788bf27fa0401c25d899f73186c8eafa.tar.gz opensim-SC_OLD-751e70af788bf27fa0401c25d899f73186c8eafa.tar.bz2 opensim-SC_OLD-751e70af788bf27fa0401c25d899f73186c8eafa.tar.xz |
NetworkServersInfo removed from CommsManager.
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs | 23 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | 8 |
2 files changed, 16 insertions, 15 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs index f3ccbda..782eddf 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs | |||
@@ -155,12 +155,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
155 | 155 | ||
156 | ((ISharedRegionModule)m_GridServiceConnector).AddRegion(scene); | 156 | ((ISharedRegionModule)m_GridServiceConnector).AddRegion(scene); |
157 | 157 | ||
158 | // Yikes!! Remove this as soon as user services get refactored | ||
159 | LocalAssetServerURI = scene.CommsManager.NetworkServersInfo.AssetURL; | ||
160 | LocalInventoryServerURI = scene.CommsManager.NetworkServersInfo.InventoryURL; | ||
161 | LocalUserServerURI = scene.CommsManager.NetworkServersInfo.UserURL; | ||
162 | HGNetworkServersInfo.Init(LocalAssetServerURI, LocalInventoryServerURI, LocalUserServerURI); | ||
163 | |||
164 | } | 158 | } |
165 | 159 | ||
166 | public void RemoveRegion(Scene scene) | 160 | public void RemoveRegion(Scene scene) |
@@ -760,7 +754,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
760 | 754 | ||
761 | protected bool IsComingHome(ForeignUserProfileData userData) | 755 | protected bool IsComingHome(ForeignUserProfileData userData) |
762 | { | 756 | { |
763 | return (userData.UserServerURI == LocalUserServerURI); | 757 | return false; |
758 | // REFACTORING PROBLEM | ||
759 | //return (userData.UserServerURI == LocalUserServerURI); | ||
764 | } | 760 | } |
765 | 761 | ||
766 | // REFACTORING PROBLEM | 762 | // REFACTORING PROBLEM |
@@ -787,13 +783,16 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
787 | 783 | ||
788 | protected bool IsLocalUser(UserAccount account) | 784 | protected bool IsLocalUser(UserAccount account) |
789 | { | 785 | { |
790 | if (account != null && | 786 | return true; |
791 | account.ServiceURLs.ContainsKey("HomeURI") && | ||
792 | account.ServiceURLs["HomeURI"] != null) | ||
793 | 787 | ||
794 | return (account.ServiceURLs["HomeURI"].ToString() == LocalUserServerURI); | 788 | // REFACTORING PROBLEM |
789 | //if (account != null && | ||
790 | // account.ServiceURLs.ContainsKey("HomeURI") && | ||
791 | // account.ServiceURLs["HomeURI"] != null) | ||
795 | 792 | ||
796 | return false; | 793 | // return (account.ServiceURLs["HomeURI"].ToString() == LocalUserServerURI); |
794 | |||
795 | //return false; | ||
797 | } | 796 | } |
798 | 797 | ||
799 | 798 | ||
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs index 5ed2b7a..8fed4da 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | |||
@@ -61,9 +61,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
61 | { | 61 | { |
62 | get | 62 | get |
63 | { | 63 | { |
64 | if (m_LocalGridInventoryURI == null || m_LocalGridInventoryURI == "") | 64 | return string.Empty; |
65 | m_LocalGridInventoryURI = m_Scene.CommsManager.NetworkServersInfo.InventoryURL; | 65 | // REFACTORING PROBLEM |
66 | return m_LocalGridInventoryURI; | 66 | //if (m_LocalGridInventoryURI == null || m_LocalGridInventoryURI == "") |
67 | // m_LocalGridInventoryURI = m_Scene.CommsManager.NetworkServersInfo.InventoryURL; | ||
68 | //return m_LocalGridInventoryURI; | ||
67 | } | 69 | } |
68 | } | 70 | } |
69 | 71 | ||