ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Fixed a bug with null value handling in WebUtil.BuildQueryString()

Browse Source 
* Changed the null check back in estate manager setup but fixed the case for an existing account being found
* Implemented SetPassword() in the SimianGrid auth connector
This commit is contained in:
John Hurliman
2010-03-26 12:21:05 -07:00
parent dd1c1b3bcd
commit 5a2315c68c
4 changed files with 5877 additions and 5834 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -1266,8 +1266,9 @@ namespace OpenSim.Region.Framework.Scenes
UserAccount account = UserAccountService.GetUserAccount(m_regInfo.ScopeID, first, last);
if (account != null)
if (account == null)
{
// Create a new account
account = new UserAccount(m_regInfo.ScopeID, first, last, String.Empty);
if (account.ServiceURLs == null || (account.ServiceURLs != null && account.ServiceURLs.Count == 0))
{
@@ -1325,7 +1326,8 @@ namespace OpenSim.Region.Framework.Scenes
}
else
{
MainConsole.Instance.Output("User account not found. Please enter the name of an existing user");
m_regInfo.EstateSettings.EstateOwner = account.PrincipalID;
m_regInfo.EstateSettings.Save();
}
}
}