ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 11:57:03 +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

12
OpenSim/Services/GridService/GridService.cs
View File

@@ -787,7 +787,7 @@ namespace OpenSim.Services.GridService
if (!UUID.TryParse(rawRegionUuid, out regionUuid))
{
MainConsole.Instance.Output("{0} is not a valid region uuid", null, rawRegionUuid);
MainConsole.Instance.Output("{0} is not a valid region uuid", rawRegionUuid);
return;
}
@@ -795,18 +795,18 @@ namespace OpenSim.Services.GridService
if (region == null)
{
MainConsole.Instance.Output("No region with UUID {0}", null, regionUuid);
MainConsole.Instance.Output("No region with UUID {0}", regionUuid);
return;
}
if (DeregisterRegion(regionUuid))
{
MainConsole.Instance.Output("Deregistered {0} {1}", null, region.RegionName, regionUuid);
MainConsole.Instance.Output("Deregistered {0} {1}", region.RegionName, regionUuid);
}
else
{
// I don't think this can ever occur if we know that the region exists.
MainConsole.Instance.Output("Error deregistering {0} {1}", null, region.RegionName, regionUuid);
MainConsole.Instance.Output("Error deregistering {0} {1}", region.RegionName, regionUuid);
}
}
}
@@ -843,7 +843,7 @@ namespace OpenSim.Services.GridService
MainConsole.Instance.Output("it will count regions that are inactive but were not deregistered from the grid service");
MainConsole.Instance.Output("(e.g. simulator crashed rather than shutting down cleanly).\n");
MainConsole.Instance.Output("Grid size: {0} km squared.", null, size / 1000000);
MainConsole.Instance.Output("Grid size: {0} km squared.", size / 1000000);
}
private void HandleShowRegion(string module, string[] cmd)
@@ -892,7 +892,7 @@ namespace OpenSim.Services.GridService
if (region == null)
{
MainConsole.Instance.Output("No region found at {0},{1}", null, x, y);
MainConsole.Instance.Output("No region found at {0},{1}", x, y);
return;
}

8
OpenSim/Services/LLLoginService/LLLoginService.cs
View File

@@ -1126,22 +1126,22 @@ namespace OpenSim.Services.LLLoginService
if (cmd.Length > 2)
{
if (Int32.TryParse(cmd[2], out m_MinLoginLevel))
MainConsole.Instance.Output("Set minimum login level to {0}", null, m_MinLoginLevel);
MainConsole.Instance.Output("Set minimum login level to {0}", m_MinLoginLevel);
else
MainConsole.Instance.Output("ERROR: {0} is not a valid login level", null, cmd[2]);
MainConsole.Instance.Output("ERROR: {0} is not a valid login level", cmd[2]);
}
break;
case "reset":
m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0);
MainConsole.Instance.Output("Reset min login level to {0}", null, m_MinLoginLevel);
MainConsole.Instance.Output("Reset min login level to {0}", m_MinLoginLevel);
break;
case "text":
if (cmd.Length > 2)
{
m_WelcomeMessage = cmd[2];
MainConsole.Instance.Output("Login welcome message set to '{0}'", null, m_WelcomeMessage);
MainConsole.Instance.Output("Login welcome message set to '{0}'", m_WelcomeMessage);
}
break;
}

4
OpenSim/Services/UserAccountService/GridUserService.cs
View File

@@ -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)

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