aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs13
-rw-r--r--OpenSim/Services/UserAccountService/UserAccountService.cs5
2 files changed, 14 insertions, 4 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 4b87f84..8d38bb8 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -500,6 +500,14 @@ namespace OpenSim
500 return clientServer; 500 return clientServer;
501 } 501 }
502 502
503 /// <summary>
504 /// Try to set up the estate owner for the given scene.
505 /// </summary>
506 /// <remarks>
507 /// The involves asking the user for information about the user on the console. If the user does not already
508 /// exist then it is created.
509 /// </remarks>
510 /// <param name="scene"></param>
503 private void SetUpEstateOwner(Scene scene) 511 private void SetUpEstateOwner(Scene scene)
504 { 512 {
505 RegionInfo regionInfo = scene.RegionInfo; 513 RegionInfo regionInfo = scene.RegionInfo;
@@ -531,8 +539,9 @@ namespace OpenSim
531 string password = MainConsole.Instance.PasswdPrompt("Password"); 539 string password = MainConsole.Instance.PasswdPrompt("Password");
532 string email = MainConsole.Instance.CmdPrompt("Email", ""); 540 string email = MainConsole.Instance.CmdPrompt("Email", "");
533 541
534 // TODO: Where do we put m_regInfo.ScopeID? 542 account
535 account = ((UserAccountService)scene.UserAccountService).CreateUser(first, last, password, email); 543 = ((UserAccountService)scene.UserAccountService).CreateUser(
544 regionInfo.ScopeID, first, last, password, email);
536 } 545 }
537// } 546// }
538 } 547 }
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index 961698c..4c6122d 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -359,7 +359,7 @@ namespace OpenSim.Services.UserAccountService
359 email = MainConsole.Instance.CmdPrompt("Email", ""); 359 email = MainConsole.Instance.CmdPrompt("Email", "");
360 else email = cmdparams[5]; 360 else email = cmdparams[5];
361 361
362 CreateUser(firstName, lastName, password, email); 362 CreateUser(UUID.Zero, firstName, lastName, password, email);
363 } 363 }
364 364
365 protected void HandleShowAccount(string module, string[] cmdparams) 365 protected void HandleShowAccount(string module, string[] cmdparams)
@@ -471,11 +471,12 @@ namespace OpenSim.Services.UserAccountService
471 /// <summary> 471 /// <summary>
472 /// Create a user 472 /// Create a user
473 /// </summary> 473 /// </summary>
474 /// <param name="scopeID">Allows hosting of multiple grids in a single database. Normally left as UUID.Zero</param>
474 /// <param name="firstName"></param> 475 /// <param name="firstName"></param>
475 /// <param name="lastName"></param> 476 /// <param name="lastName"></param>
476 /// <param name="password"></param> 477 /// <param name="password"></param>
477 /// <param name="email"></param> 478 /// <param name="email"></param>
478 public UserAccount CreateUser(string firstName, string lastName, string password, string email) 479 public UserAccount CreateUser(UUID scopeID, string firstName, string lastName, string password, string email)
479 { 480 {
480 UserAccount account = GetUserAccount(UUID.Zero, firstName, lastName); 481 UserAccount account = GetUserAccount(UUID.Zero, firstName, lastName);
481 if (null == account) 482 if (null == account)