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

remove some more useless NULL arguments

Browse Source
This commit is contained in:
UbitUmarov
2019-10-22 13:04:01 +01:00
parent da0a8d6c43
commit 46e36601cb
20 changed files with 81 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -434,19 +434,19 @@ namespace OpenSim.Services.UserAccountService
if (ua == null)
{
MainConsole.Instance.Output("No user named {0} {1}", null, firstName, lastName);
MainConsole.Instance.Output("No user named {0} {1}", firstName, lastName);
return;
}
MainConsole.Instance.Output("Name: {0}", null, ua.Name);
MainConsole.Instance.Output("ID: {0}", null, ua.PrincipalID);
MainConsole.Instance.Output("Title: {0}", null, ua.UserTitle);
MainConsole.Instance.Output("E-mail: {0}", null, ua.Email);
MainConsole.Instance.Output("Created: {0}", null, Utils.UnixTimeToDateTime(ua.Created));
MainConsole.Instance.Output("Level: {0}", null, ua.UserLevel);
MainConsole.Instance.Output("Flags: {0}", null, ua.UserFlags);
MainConsole.Instance.Output("Name: {0}", ua.Name);
MainConsole.Instance.Output("ID: {0}", ua.PrincipalID);
MainConsole.Instance.Output("Title: {0}", ua.UserTitle);
MainConsole.Instance.Output("E-mail: {0}", ua.Email);
MainConsole.Instance.Output("Created: {0}", Utils.UnixTimeToDateTime(ua.Created));
MainConsole.Instance.Output("Level: {0}", ua.UserLevel);
MainConsole.Instance.Output("Flags: {0}", ua.UserFlags);
foreach (KeyValuePair<string, Object> kvp in ua.ServiceURLs)
MainConsole.Instance.Output("{0}: {1}", null, kvp.Key, kvp.Value);
MainConsole.Instance.Output("{0}: {1}", kvp.Key, kvp.Value);
}
protected void HandleResetUserPassword(string module, string[] cmdparams)
@@ -470,7 +470,7 @@ namespace OpenSim.Services.UserAccountService
UserAccount account = GetUserAccount(UUID.Zero, firstName, lastName);
if (account == null)
{
MainConsole.Instance.Output("No such user as {0} {1}", null, firstName, lastName);
MainConsole.Instance.Output("No such user as {0} {1}", firstName, lastName);
return;
}
@@ -479,9 +479,9 @@ namespace OpenSim.Services.UserAccountService
success = m_AuthenticationService.SetPassword(account.PrincipalID, newPassword);
if (!success)
MainConsole.Instance.Output("Unable to reset password for account {0} {1}.", null, firstName, lastName);
MainConsole.Instance.Output("Unable to reset password for account {0} {1}.", firstName, lastName);
else
MainConsole.Instance.Output("Password reset for user {0} {1}", null, firstName, lastName);
MainConsole.Instance.Output("Password reset for user {0} {1}", firstName, lastName);
}
protected void HandleResetUserEmail(string module, string[] cmdparams)
@@ -505,7 +505,7 @@ namespace OpenSim.Services.UserAccountService
UserAccount account = GetUserAccount(UUID.Zero, firstName, lastName);
if (account == null)
{
MainConsole.Instance.Output("No such user as {0} {1}", null, firstName, lastName);
MainConsole.Instance.Output("No such user as {0} {1}", firstName, lastName);
return;
}
@@ -515,9 +515,9 @@ namespace OpenSim.Services.UserAccountService
success = StoreUserAccount(account);
if (!success)
MainConsole.Instance.Output("Unable to set Email for account {0} {1}.", null, firstName, lastName);
MainConsole.Instance.Output("Unable to set Email for account {0} {1}.", firstName, lastName);
else
MainConsole.Instance.Output("User Email set for user {0} {1} to {2}", null, firstName, lastName, account.Email);
MainConsole.Instance.Output("User Email set for user {0} {1} to {2}", firstName, lastName, account.Email);
}
@@ -555,9 +555,9 @@ namespace OpenSim.Services.UserAccountService
bool success = StoreUserAccount(account);
if (!success)
MainConsole.Instance.Output("Unable to set user level for account {0} {1}.", null, firstName, lastName);
MainConsole.Instance.Output("Unable to set user level for account {0} {1}.", firstName, lastName);
else
MainConsole.Instance.Output("User level set for user {0} {1} to {2}", null, firstName, lastName, level);
MainConsole.Instance.Output("User level set for user {0} {1} to {2}", firstName, lastName, level);
}
#endregion