aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDahlia Trimble2008-07-05 08:13:22 +0000
committerDahlia Trimble2008-07-05 08:13:22 +0000
commit8465f378ac09b948431f1ebf2e0e9ab345c8fb21 (patch)
treef60dfd7a7e041ba912d9189b295717205b294a7a
parentChanged default terrain lower limit to -100 instead of 100 (diff)
downloadopensim-SC_OLD-8465f378ac09b948431f1ebf2e0e9ab345c8fb21.zip
opensim-SC_OLD-8465f378ac09b948431f1ebf2e0e9ab345c8fb21.tar.gz
opensim-SC_OLD-8465f378ac09b948431f1ebf2e0e9ab345c8fb21.tar.bz2
opensim-SC_OLD-8465f378ac09b948431f1ebf2e0e9ab345c8fb21.tar.xz
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
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs28
1 files changed, 16 insertions, 12 deletions
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index ccd6491..a45e236 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -183,21 +183,25 @@ namespace OpenSim.Framework.Communications
183 uint regY = 1000; 183 uint regY = 1000;
184 184
185 if (cmmdParams.Length < 2) 185 if (cmmdParams.Length < 2)
186 {
187 firstName = MainConsole.Instance.CmdPrompt("First name", "Default"); 186 firstName = MainConsole.Instance.CmdPrompt("First name", "Default");
187 else firstName = cmmdParams[1];
188
189 if ( cmmdParams.Length < 3 )
188 lastName = MainConsole.Instance.CmdPrompt("Last name", "User"); 190 lastName = MainConsole.Instance.CmdPrompt("Last name", "User");
191 else lastName = cmmdParams[2];
192
193 if ( cmmdParams.Length < 4 )
189 password = MainConsole.Instance.PasswdPrompt("Password"); 194 password = MainConsole.Instance.PasswdPrompt("Password");
190 regX = Convert.ToUInt32(MainConsole.Instance.CmdPrompt("Start Region X", "1000")); 195 else password = cmmdParams[3];
191 regY = Convert.ToUInt32(MainConsole.Instance.CmdPrompt("Start Region Y", "1000")); 196
192 } 197 if ( cmmdParams.Length < 5 )
193 else 198 regX = Convert.ToUInt32(MainConsole.Instance.CmdPrompt("Start Region X", regX.ToString()));
194 { 199 else regX = Convert.ToUInt32(cmmdParams[4]);
195 firstName = cmmdParams[1]; 200
196 lastName = cmmdParams[2]; 201 if ( cmmdParams.Length < 6 )
197 password = cmmdParams[3]; 202 regY = Convert.ToUInt32(MainConsole.Instance.CmdPrompt("Start Region Y", regY.ToString()));
198 regX = Convert.ToUInt32(cmmdParams[4]); 203 else regY = Convert.ToUInt32(cmmdParams[5]);
199 regY = Convert.ToUInt32(cmmdParams[5]); 204
200 }
201 205
202 if (null == m_userService.GetUserProfile(firstName, lastName)) 206 if (null == m_userService.GetUserProfile(firstName, lastName))
203 { 207 {