aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorDiva Canto2009-12-21 07:44:17 -0800
committerDiva Canto2009-12-21 07:44:17 -0800
commit68187f7245a113e0afab0bfc28820bb0be5387b5 (patch)
treedd05910aa49845c180f1bf8bcadf9d4769558582 /OpenSim/Framework
parentMerge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-68187f7245a113e0afab0bfc28820bb0be5387b5.zip
opensim-SC_OLD-68187f7245a113e0afab0bfc28820bb0be5387b5.tar.gz
opensim-SC_OLD-68187f7245a113e0afab0bfc28820bb0be5387b5.tar.bz2
opensim-SC_OLD-68187f7245a113e0afab0bfc28820bb0be5387b5.tar.xz
Bug fix: in standalone, HGInventoryBroker needs to get the local inventory server URL from NetworkServersInfo.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs2
1 files changed, 2 insertions, 0 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)