aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJohn Hurliman2010-03-26 12:21:05 -0700
committerJohn Hurliman2010-03-26 12:21:05 -0700
commit5a2315c68c7ccac2fafeb7e2cd51ecda863a9fa7 (patch)
treee42b1104ade22fdb4dfb2129aad45f908f5a3044 /OpenSim/Region/Framework
parentFixed a backwards null check that was preventing estate owner from being set ... (diff)
downloadopensim-SC-5a2315c68c7ccac2fafeb7e2cd51ecda863a9fa7.zip
opensim-SC-5a2315c68c7ccac2fafeb7e2cd51ecda863a9fa7.tar.gz
opensim-SC-5a2315c68c7ccac2fafeb7e2cd51ecda863a9fa7.tar.bz2
opensim-SC-5a2315c68c7ccac2fafeb7e2cd51ecda863a9fa7.tar.xz
* Fixed a bug with null value handling in WebUtil.BuildQueryString()
* 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
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 7fed1ea..8a583c1 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1266,8 +1266,9 @@ namespace OpenSim.Region.Framework.Scenes
1266 1266
1267 UserAccount account = UserAccountService.GetUserAccount(m_regInfo.ScopeID, first, last); 1267 UserAccount account = UserAccountService.GetUserAccount(m_regInfo.ScopeID, first, last);
1268 1268
1269 if (account != null) 1269 if (account == null)
1270 { 1270 {
1271 // Create a new account
1271 account = new UserAccount(m_regInfo.ScopeID, first, last, String.Empty); 1272 account = new UserAccount(m_regInfo.ScopeID, first, last, String.Empty);
1272 if (account.ServiceURLs == null || (account.ServiceURLs != null && account.ServiceURLs.Count == 0)) 1273 if (account.ServiceURLs == null || (account.ServiceURLs != null && account.ServiceURLs.Count == 0))
1273 { 1274 {
@@ -1325,7 +1326,8 @@ namespace OpenSim.Region.Framework.Scenes
1325 } 1326 }
1326 else 1327 else
1327 { 1328 {
1328 MainConsole.Instance.Output("User account not found. Please enter the name of an existing user"); 1329 m_regInfo.EstateSettings.EstateOwner = account.PrincipalID;
1330 m_regInfo.EstateSettings.Save();
1329 } 1331 }
1330 } 1332 }
1331 } 1333 }