diff options
author | Diva Canto | 2010-01-09 18:16:14 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-09 18:16:14 -0800 |
commit | 7cb66de2e022d1013eacb43dc0186a575a19a5c6 (patch) | |
tree | ec19053cdadef37350cd6d6f860e4cf75523c408 /OpenSim/Region/Application/OpenSim.cs | |
parent | * Added SetPassword to IAuthenticationService. (diff) | |
download | opensim-SC-7cb66de2e022d1013eacb43dc0186a575a19a5c6.zip opensim-SC-7cb66de2e022d1013eacb43dc0186a575a19a5c6.tar.gz opensim-SC-7cb66de2e022d1013eacb43dc0186a575a19a5c6.tar.bz2 opensim-SC-7cb66de2e022d1013eacb43dc0186a575a19a5c6.tar.xz |
* Moved command reset password from OpenSim to UserAccountService.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 787d025..31cc610 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -347,13 +347,6 @@ namespace OpenSim | |||
347 | "kill uuid <UUID>", | 347 | "kill uuid <UUID>", |
348 | "Kill an object by UUID", KillUUID); | 348 | "Kill an object by UUID", KillUUID); |
349 | 349 | ||
350 | if (ConfigurationSettings.Standalone) | ||
351 | { | ||
352 | |||
353 | m_console.Commands.AddCommand("region", false, "reset user password", | ||
354 | "reset user password [<first> [<last> [<password>]]]", | ||
355 | "Reset a user password", HandleResetUserPassword); | ||
356 | } | ||
357 | 350 | ||
358 | m_console.Commands.AddCommand("hypergrid", false, "link-mapping", "link-mapping [<x> <y>] <cr>", | 351 | m_console.Commands.AddCommand("hypergrid", false, "link-mapping", "link-mapping [<x> <y>] <cr>", |
359 | "Set local coordinate to map HG regions to", RunCommand); | 352 | "Set local coordinate to map HG regions to", RunCommand); |
@@ -809,21 +802,6 @@ namespace OpenSim | |||
809 | m_console.ConsoleScene = m_sceneManager.CurrentScene; | 802 | m_console.ConsoleScene = m_sceneManager.CurrentScene; |
810 | } | 803 | } |
811 | 804 | ||
812 | /// <summary> | ||
813 | /// Execute switch for some of the reset commands | ||
814 | /// </summary> | ||
815 | /// <param name="args"></param> | ||
816 | protected void HandleResetUserPassword(string module, string[] cmd) | ||
817 | { | ||
818 | if (ConfigurationSettings.Standalone) | ||
819 | { | ||
820 | ResetUserPassword(cmd); | ||
821 | } | ||
822 | else | ||
823 | { | ||
824 | m_log.Info("Reset user password is not available in grid mode, use the user-server."); | ||
825 | } | ||
826 | } | ||
827 | 805 | ||
828 | /// <summary> | 806 | /// <summary> |
829 | /// Turn on some debugging values for OpenSim. | 807 | /// Turn on some debugging values for OpenSim. |
@@ -1057,31 +1035,6 @@ namespace OpenSim | |||
1057 | } | 1035 | } |
1058 | 1036 | ||
1059 | /// <summary> | 1037 | /// <summary> |
1060 | /// Reset a user password. | ||
1061 | /// </summary> | ||
1062 | /// <param name="cmdparams"></param> | ||
1063 | private void ResetUserPassword(string[] cmdparams) | ||
1064 | { | ||
1065 | string firstName; | ||
1066 | string lastName; | ||
1067 | string newPassword; | ||
1068 | |||
1069 | if (cmdparams.Length < 4) | ||
1070 | firstName = MainConsole.Instance.CmdPrompt("First name"); | ||
1071 | else firstName = cmdparams[3]; | ||
1072 | |||
1073 | if (cmdparams.Length < 5) | ||
1074 | lastName = MainConsole.Instance.CmdPrompt("Last name"); | ||
1075 | else lastName = cmdparams[4]; | ||
1076 | |||
1077 | if (cmdparams.Length < 6) | ||
1078 | newPassword = MainConsole.Instance.PasswdPrompt("New password"); | ||
1079 | else newPassword = cmdparams[5]; | ||
1080 | |||
1081 | m_commsManager.UserAdminService.ResetUserPassword(firstName, lastName, newPassword); | ||
1082 | } | ||
1083 | |||
1084 | /// <summary> | ||
1085 | /// Use XML2 format to serialize data to a file | 1038 | /// Use XML2 format to serialize data to a file |
1086 | /// </summary> | 1039 | /// </summary> |
1087 | /// <param name="module"></param> | 1040 | /// <param name="module"></param> |