lotek/opensim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mantis 8766: fix creators names caching

Browse Source
This commit is contained in:
UbitUmarov
2020-09-08 01:03:17 +01:00
parent 650e6bbe55
commit da09a897f6
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
View File

@@ -518,8 +518,8 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
userdata.ServerURLs = new Dictionary<string, object>();
}
if (userdata.ServerURLs != null && userdata.ServerURLs.ContainsKey(serverType) && userdata.ServerURLs[serverType] != null)
return userdata.ServerURLs[serverType].ToString();
if (userdata.ServerURLs != null && userdata.ServerURLs.TryGetValue(serverType, out object ourl) && ourl != null)
return ourl.ToString();
}
}
return string.Empty;
@@ -896,7 +896,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
}
else
{
oldUser.FirstName = firstname.Replace(" ", ".") + "." + firstname.Replace(" ", ".");
oldUser.FirstName = firstname + "." + lastname.Replace(" ", ".");
oldUser.LastName = "@" + uri.Authority;
oldUser.HomeURL = uri.AbsoluteUri;
oldUser.IsLocal = false;
@@ -904,7 +904,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
}
else
{
oldUser.FirstName = firstname.Replace(" ", ".") + "." + firstname.Replace(" ", ".");
oldUser.FirstName = firstname + "." + lastname.Replace(" ", ".");
oldUser.LastName = "UMMM1Unknown";
oldUser.IsLocal = true;
oldUser.HomeURL = string.Empty;

2
OpenSim/Tests/Clients/Assets/AssetsClient.cs
View File

@@ -80,8 +80,6 @@ namespace OpenSim.Tests.Clients.AssetsClient
ThreadPool.GetMinThreads(out max1, out max2);
m_log.InfoFormat("[ASSET CLIENT]: Post set min threads = {1} - {2}", serverURI, max1, max2);
ServicePointManager.DefaultConnectionLimit = 12;
AssetServicesConnector m_Connector = new AssetServicesConnector(serverURI);
m_Connector.MaxAssetRequestConcurrency = 30;