OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '90466515839eb34d7fd9984c92f1970ab5d6f3ad' into bigmerge

avinationmerge
Melanie 2011-10-11 21:29:58 +01:00
parent 288f5bd727 9046651583
commit 986a3838a6
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/Application/OpenSimBase.cs
View File

@ -500,6 +500,14 @@ namespace OpenSim
return clientServer; return clientServer;
} }
/// <summary>
/// Try to set up the estate owner for the given scene.
/// </summary>
/// <remarks>
/// The involves asking the user for information about the user on the console. If the user does not already
/// exist then it is created.
/// </remarks>
/// <param name="scene"></param>
private void SetUpEstateOwner(Scene scene) private void SetUpEstateOwner(Scene scene)
{ {
RegionInfo regionInfo = scene.RegionInfo; RegionInfo regionInfo = scene.RegionInfo;
@ -531,8 +539,9 @@ namespace OpenSim
string password = MainConsole.Instance.PasswdPrompt("Password"); string password = MainConsole.Instance.PasswdPrompt("Password");
string email = MainConsole.Instance.CmdPrompt("Email", ""); string email = MainConsole.Instance.CmdPrompt("Email", "");
// TODO: Where do we put m_regInfo.ScopeID? account
account = ((UserAccountService)scene.UserAccountService).CreateUser(first, last, password, email); = ((UserAccountService)scene.UserAccountService).CreateUser(
regionInfo.ScopeID, first, last, password, email);
} }
// } // }
} }

5
OpenSim/Services/UserAccountService/UserAccountService.cs
View File

@ -359,7 +359,7 @@ namespace OpenSim.Services.UserAccountService
email = MainConsole.Instance.CmdPrompt("Email", ""); email = MainConsole.Instance.CmdPrompt("Email", "");
else email = cmdparams[5]; else email = cmdparams[5];
CreateUser(firstName, lastName, password, email); CreateUser(UUID.Zero, firstName, lastName, password, email);
} }
protected void HandleShowAccount(string module, string[] cmdparams) protected void HandleShowAccount(string module, string[] cmdparams)
@ -471,11 +471,12 @@ namespace OpenSim.Services.UserAccountService
/// <summary> /// <summary>
/// Create a user /// Create a user
/// </summary> /// </summary>
/// <param name="scopeID">Allows hosting of multiple grids in a single database. Normally left as UUID.Zero</param>
/// <param name="firstName"></param> /// <param name="firstName"></param>
/// <param name="lastName"></param> /// <param name="lastName"></param>
/// <param name="password"></param> /// <param name="password"></param>
/// <param name="email"></param> /// <param name="email"></param>
public UserAccount CreateUser(string firstName, string lastName, string password, string email) public UserAccount CreateUser(UUID scopeID, string firstName, string lastName, string password, string email)
{ {
UserAccount account = GetUserAccount(UUID.Zero, firstName, lastName); UserAccount account = GetUserAccount(UUID.Zero, firstName, lastName);
if (null == account) if (null == account)