diff options
author | Diva Canto | 2009-12-21 07:44:17 -0800 |
---|---|---|
committer | Diva Canto | 2009-12-21 07:44:17 -0800 |
commit | 68187f7245a113e0afab0bfc28820bb0be5387b5 (patch) | |
tree | dd05910aa49845c180f1bf8bcadf9d4769558582 | |
parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-68187f7245a113e0afab0bfc28820bb0be5387b5.zip opensim-SC-68187f7245a113e0afab0bfc28820bb0be5387b5.tar.gz opensim-SC-68187f7245a113e0afab0bfc28820bb0be5387b5.tar.bz2 opensim-SC-68187f7245a113e0afab0bfc28820bb0be5387b5.tar.xz |
Bug fix: in standalone, HGInventoryBroker needs to get the local inventory server URL from NetworkServersInfo.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | 15 |
2 files changed, 15 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs index 29a9e14..acae4b1 100644 --- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs +++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | |||
@@ -142,6 +142,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
142 | 142 | ||
143 | if (userProfile != null) | 143 | if (userProfile != null) |
144 | { | 144 | { |
145 | |||
145 | if ((userProfile.UserAssetURI == null || userProfile.UserAssetURI == "") && m_commsManager.NetworkServersInfo != null) | 146 | if ((userProfile.UserAssetURI == null || userProfile.UserAssetURI == "") && m_commsManager.NetworkServersInfo != null) |
146 | userProfile.UserAssetURI = m_commsManager.NetworkServersInfo.AssetURL; | 147 | userProfile.UserAssetURI = m_commsManager.NetworkServersInfo.AssetURL; |
147 | if ((userProfile.UserInventoryURI == null || userProfile.UserInventoryURI == "") && m_commsManager.NetworkServersInfo != null) | 148 | if ((userProfile.UserInventoryURI == null || userProfile.UserInventoryURI == "") && m_commsManager.NetworkServersInfo != null) |
@@ -177,6 +178,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
177 | UserProfileData userProfile = m_commsManager.UserService.GetUserProfile(userID); | 178 | UserProfileData userProfile = m_commsManager.UserService.GetUserProfile(userID); |
178 | if (userProfile != null) | 179 | if (userProfile != null) |
179 | { | 180 | { |
181 | |||
180 | if ((userProfile.UserAssetURI == null || userProfile.UserAssetURI == "") && m_commsManager.NetworkServersInfo != null) | 182 | if ((userProfile.UserAssetURI == null || userProfile.UserAssetURI == "") && m_commsManager.NetworkServersInfo != null) |
181 | userProfile.UserAssetURI = m_commsManager.NetworkServersInfo.AssetURL; | 183 | userProfile.UserAssetURI = m_commsManager.NetworkServersInfo.AssetURL; |
182 | if ((userProfile.UserInventoryURI == null || userProfile.UserInventoryURI == "") && m_commsManager.NetworkServersInfo != null) | 184 | if ((userProfile.UserInventoryURI == null || userProfile.UserInventoryURI == "") && m_commsManager.NetworkServersInfo != null) |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs index f073f32..1fdf1ef 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | |||
@@ -56,6 +56,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
56 | private ISessionAuthInventoryService m_HGService; | 56 | private ISessionAuthInventoryService m_HGService; |
57 | 57 | ||
58 | private string m_LocalGridInventoryURI = string.Empty; | 58 | private string m_LocalGridInventoryURI = string.Empty; |
59 | |||
60 | private string LocalGridInventory | ||
61 | { | ||
62 | get | ||
63 | { | ||
64 | if (m_LocalGridInventoryURI == null || m_LocalGridInventoryURI == "") | ||
65 | m_LocalGridInventoryURI = m_Scene.CommsManager.NetworkServersInfo.InventoryURL; | ||
66 | return m_LocalGridInventoryURI; | ||
67 | } | ||
68 | } | ||
69 | |||
59 | public Type ReplaceableInterface | 70 | public Type ReplaceableInterface |
60 | { | 71 | { |
61 | get { return null; } | 72 | get { return null; } |
@@ -533,7 +544,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
533 | 544 | ||
534 | string userInventoryServerURI = Util.ServerURI(uinfo.UserProfile.UserInventoryURI); | 545 | string userInventoryServerURI = Util.ServerURI(uinfo.UserProfile.UserInventoryURI); |
535 | 546 | ||
536 | string uri = m_LocalGridInventoryURI.TrimEnd('/'); | 547 | string uri = LocalGridInventory.TrimEnd('/'); |
537 | 548 | ||
538 | if ((userInventoryServerURI == uri) || (userInventoryServerURI == "")) | 549 | if ((userInventoryServerURI == uri) || (userInventoryServerURI == "")) |
539 | { | 550 | { |
@@ -545,7 +556,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
545 | 556 | ||
546 | private string GetUserInventoryURI(UUID userID) | 557 | private string GetUserInventoryURI(UUID userID) |
547 | { | 558 | { |
548 | string invURI = m_LocalGridInventoryURI; | 559 | string invURI = LocalGridInventory; |
549 | 560 | ||
550 | CachedUserInfo uinfo = m_UserProfileService.GetUserDetails(userID); | 561 | CachedUserInfo uinfo = m_UserProfileService.GetUserDetails(userID); |
551 | if ((uinfo == null) || (uinfo.UserProfile == null)) | 562 | if ((uinfo == null) || (uinfo.UserProfile == null)) |