From 46e36601cb3c54e6e441284aed7c0c5c35970a4c Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 22 Oct 2019 13:04:01 +0100 Subject: remove some more useless NULL arguments --- .../Services/UserAccountService/GridUserService.cs | 4 +-- .../UserAccountService/UserAccountService.cs | 34 +++++++++++----------- 2 files changed, 19 insertions(+), 19 deletions(-) (limited to 'OpenSim/Services/UserAccountService') diff --git a/OpenSim/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs index 6cea69f..d1e92ab 100755 --- a/OpenSim/Services/UserAccountService/GridUserService.cs +++ b/OpenSim/Services/UserAccountService/GridUserService.cs @@ -94,7 +94,7 @@ namespace OpenSim.Services.UserAccountService MainConsole.Instance.Output(cdl.ToString()); } - MainConsole.Instance.Output("Entries: {0}", null, data.Length); + MainConsole.Instance.Output("Entries: {0}", data.Length); } protected void HandleShowGridUsersOnline(string module, string[] cmdparams) @@ -123,7 +123,7 @@ namespace OpenSim.Services.UserAccountService } } - MainConsole.Instance.Output("Users online: {0}", null, onlineRecentlyCount); + MainConsole.Instance.Output("Users online: {0}", onlineRecentlyCount); } private GridUserData GetGridUserData(string userID) diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs index 5270799..c51b9eb 100755 --- a/OpenSim/Services/UserAccountService/UserAccountService.cs +++ b/OpenSim/Services/UserAccountService/UserAccountService.cs @@ -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 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 -- cgit v1.1