From 8465f378ac09b948431f1ebf2e0e9ab345c8fb21 Mon Sep 17 00:00:00 2001 From: Dahlia Trimble Date: Sat, 5 Jul 2008 08:13:22 +0000 Subject: [PATCH] changes prompting of create user console command to only ask for unspecified parameters and avoid an exception if the wrong number of parameters are supplied --- .../Communications/CommunicationsManager.cs | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs index ccd6491ada..a45e23622d 100644 --- a/OpenSim/Framework/Communications/CommunicationsManager.cs +++ b/OpenSim/Framework/Communications/CommunicationsManager.cs @@ -183,21 +183,25 @@ namespace OpenSim.Framework.Communications uint regY = 1000; if (cmmdParams.Length < 2) - { firstName = MainConsole.Instance.CmdPrompt("First name", "Default"); + else firstName = cmmdParams[1]; + + if ( cmmdParams.Length < 3 ) lastName = MainConsole.Instance.CmdPrompt("Last name", "User"); + else lastName = cmmdParams[2]; + + if ( cmmdParams.Length < 4 ) password = MainConsole.Instance.PasswdPrompt("Password"); - regX = Convert.ToUInt32(MainConsole.Instance.CmdPrompt("Start Region X", "1000")); - regY = Convert.ToUInt32(MainConsole.Instance.CmdPrompt("Start Region Y", "1000")); - } - else - { - firstName = cmmdParams[1]; - lastName = cmmdParams[2]; - password = cmmdParams[3]; - regX = Convert.ToUInt32(cmmdParams[4]); - regY = Convert.ToUInt32(cmmdParams[5]); - } + else password = cmmdParams[3]; + + if ( cmmdParams.Length < 5 ) + regX = Convert.ToUInt32(MainConsole.Instance.CmdPrompt("Start Region X", regX.ToString())); + else regX = Convert.ToUInt32(cmmdParams[4]); + + if ( cmmdParams.Length < 6 ) + regY = Convert.ToUInt32(MainConsole.Instance.CmdPrompt("Start Region Y", regY.ToString())); + else regY = Convert.ToUInt32(cmmdParams[5]); + if (null == m_userService.GetUserProfile(firstName, lastName)) {