aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-09-16 00:36:43 +0100
committerJustin Clark-Casey (justincc)2011-09-16 00:36:43 +0100
commit90466515839eb34d7fd9984c92f1970ab5d6f3ad (patch)
treef034982a17d72c6394383960b02d21c1df960f62 /OpenSim
parentOn standalone, by default create the necessary minimum body parts and clothes... (diff)
downloadopensim-SC_OLD-90466515839eb34d7fd9984c92f1970ab5d6f3ad.zip
opensim-SC_OLD-90466515839eb34d7fd9984c92f1970ab5d6f3ad.tar.gz
opensim-SC_OLD-90466515839eb34d7fd9984c92f1970ab5d6f3ad.tar.bz2
opensim-SC_OLD-90466515839eb34d7fd9984c92f1970ab5d6f3ad.tar.xz
Pass any region scope through to the CreateUser() method
Diffstat (limited to 'OpenSim')
-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 8662ea8..54caac4 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -422,6 +422,14 @@ namespace OpenSim
422 return clientServer; 422 return clientServer;
423 } 423 }
424 424
425 /// <summary>
426 /// Try to set up the estate owner for the given scene.
427 /// </summary>
428 /// <remarks>
429 /// The involves asking the user for information about the user on the console. If the user does not already
430 /// exist then it is created.
431 /// </remarks>
432 /// <param name="scene"></param>
425 private void SetUpEstateOwner(Scene scene) 433 private void SetUpEstateOwner(Scene scene)
426 { 434 {
427 RegionInfo regionInfo = scene.RegionInfo; 435 RegionInfo regionInfo = scene.RegionInfo;
@@ -453,8 +461,9 @@ namespace OpenSim
453 string password = MainConsole.Instance.PasswdPrompt("Password"); 461 string password = MainConsole.Instance.PasswdPrompt("Password");
454 string email = MainConsole.Instance.CmdPrompt("Email", ""); 462 string email = MainConsole.Instance.CmdPrompt("Email", "");
455 463
456 // TODO: Where do we put m_regInfo.ScopeID? 464 account
457 account = ((UserAccountService)scene.UserAccountService).CreateUser(first, last, password, email); 465 = ((UserAccountService)scene.UserAccountService).CreateUser(
466 regionInfo.ScopeID, first, last, password, email);
458 } 467 }
459// } 468// }
460 } 469 }
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index 0acfdcf..e071b94 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -340,7 +340,7 @@ namespace OpenSim.Services.UserAccountService
340 email = MainConsole.Instance.CmdPrompt("Email", ""); 340 email = MainConsole.Instance.CmdPrompt("Email", "");
341 else email = cmdparams[5]; 341 else email = cmdparams[5];
342 342
343 CreateUser(firstName, lastName, password, email); 343 CreateUser(UUID.Zero, firstName, lastName, password, email);
344 } 344 }
345 345
346 protected void HandleShowAccount(string module, string[] cmdparams) 346 protected void HandleShowAccount(string module, string[] cmdparams)
@@ -452,11 +452,12 @@ namespace OpenSim.Services.UserAccountService
452 /// <summary> 452 /// <summary>
453 /// Create a user 453 /// Create a user
454 /// </summary> 454 /// </summary>
455 /// <param name="scopeID">Allows hosting of multiple grids in a single database. Normally left as UUID.Zero</param>
455 /// <param name="firstName"></param> 456 /// <param name="firstName"></param>
456 /// <param name="lastName"></param> 457 /// <param name="lastName"></param>
457 /// <param name="password"></param> 458 /// <param name="password"></param>
458 /// <param name="email"></param> 459 /// <param name="email"></param>
459 public UserAccount CreateUser(string firstName, string lastName, string password, string email) 460 public UserAccount CreateUser(UUID scopeID, string firstName, string lastName, string password, string email)
460 { 461 {
461 UserAccount account = GetUserAccount(UUID.Zero, firstName, lastName); 462 UserAccount account = GetUserAccount(UUID.Zero, firstName, lastName);
462 if (null == account) 463 if (null == account)