OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Attempt at fixing mantis #4411.

0.6.8-post-fixes
Diva Canto 2009-12-11 08:11:26 -08:00 committed by Justin Clark-Casey (justincc)
parent 19032739be
commit fc374ada12
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
View File

@ -139,9 +139,16 @@ namespace OpenSim.Framework.Communications.Cache
else
{
UserProfileData userProfile = m_commsManager.UserService.GetUserProfile(fname, lname);
if (userProfile != null)
{
if (userProfile.UserAssetURI == null || userProfile.UserAssetURI == "")
userProfile.UserAssetURI = m_commsManager.NetworkServersInfo.AssetURL;
if (userProfile.UserInventoryURI == null || userProfile.UserInventoryURI == "")
userProfile.UserInventoryURI = m_commsManager.NetworkServersInfo.InventoryURL;
return AddToCaches(userProfile);
}
else
return null;
}
@ -169,7 +176,14 @@ namespace OpenSim.Framework.Communications.Cache
{
UserProfileData userProfile = m_commsManager.UserService.GetUserProfile(userID);
if (userProfile != null)
{
if (userProfile.UserAssetURI == null || userProfile.UserAssetURI == "")
userProfile.UserAssetURI = m_commsManager.NetworkServersInfo.AssetURL;
if (userProfile.UserInventoryURI == null || userProfile.UserInventoryURI == "")
userProfile.UserInventoryURI = m_commsManager.NetworkServersInfo.InventoryURL;
return AddToCaches(userProfile);
}
else
return null;
}

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

@ -155,7 +155,7 @@ 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.UserURL;
LocalAssetServerURI = scene.CommsManager.NetworkServersInfo.AssetURL;
LocalInventoryServerURI = scene.CommsManager.NetworkServersInfo.InventoryURL;
LocalUserServerURI = scene.CommsManager.NetworkServersInfo.UserURL;
HGNetworkServersInfo.Init(LocalAssetServerURI, LocalInventoryServerURI, LocalUserServerURI);