From b112539f9514143c9c43e8e7960e0fedd87ed34d Mon Sep 17 00:00:00 2001
From: lbsa71 <lbsa71@hotmail.com>
Date: Tue, 11 Sep 2007 14:20:09 +0000
Subject: [PATCH] * minor refactorings

---
 .../InventoryServiceBase.cs                   |  2 -
 OpenSim/Region/Application/OpenSimMain.cs     | 21 +++------
 .../Local/CommunicationsLocal.cs              | 47 ++++++++++++-------
 3 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/OpenSim/Framework/InventoryServiceBase/InventoryServiceBase.cs b/OpenSim/Framework/InventoryServiceBase/InventoryServiceBase.cs
index 20d3a77680..dc66bd43ac 100644
--- a/OpenSim/Framework/InventoryServiceBase/InventoryServiceBase.cs
+++ b/OpenSim/Framework/InventoryServiceBase/InventoryServiceBase.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using System.Text;
 using libsecondlife;
 using OpenSim.Framework.Console;
-using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Data;
 
 namespace OpenSim.Framework.InventoryServiceBase
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index c1522b1e2f..9ac5117573 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -27,29 +27,22 @@
 */
 
 using System;
+using System.Collections.Generic;
 using System.IO;
-using libsecondlife;
+using System.Text;
 using Nini.Config;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications;
+using OpenSim.Framework.Communications.Caches;
 using OpenSim.Framework.Console;
-using OpenSim.Framework.Data;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Types;
-using OpenSim.Framework.Configuration;
-using OpenSim.Region.Physics.Manager;
-
+using OpenSim.Framework.Utilities;
 using OpenSim.Region.ClientStack;
 using OpenSim.Region.Communications.Local;
 using OpenSim.Region.Communications.OGS1;
-using OpenSim.Framework.Communications.Caches;
-using OpenSim.Region.Environment.Scenes;
-using OpenSim.Region.Environment.Modules;
 using OpenSim.Region.Environment;
-using System.Text;
-using System.Collections.Generic;
-using OpenSim.Framework.Utilities;
+using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Physics.Manager;
 
 namespace OpenSim
 {
@@ -75,7 +68,7 @@ namespace OpenSim
         protected List<Scene> m_localScenes = new List<Scene>();
 
         private bool m_silent;
-        private string m_logFilename = ("region-console.log");
+        private readonly string m_logFilename = ("region-console.log");
         private bool m_permissions = false;
 
         private bool m_DefaultModules = true;
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index cf0e871497..e326a1e2c2 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -34,6 +34,7 @@ using OpenSim.Framework.Console;
 using OpenSim.Framework.Utilities;
 using OpenSim.Framework.Data;
 using OpenSim.Framework.UserManagement;
+using libsecondlife;
 
 namespace OpenSim.Region.Communications.Local
 {
@@ -79,44 +80,54 @@ namespace OpenSim.Region.Communications.Local
             switch (cmmdParams[0])
             {
                 case "user":
-                    string tempfirstname;
-                    string templastname;
-                    string tempMD5Passwd;
+                    string firstName;
+                    string lastName;
+                    string password;
                     uint regX = 1000;
                     uint regY = 1000;
 
                     if (cmmdParams.Length < 2)
                     {
                        
-                        tempfirstname = MainLog.Instance.CmdPrompt("First name", "Default");
-                        templastname = MainLog.Instance.CmdPrompt("Last name", "User");
-                        tempMD5Passwd = MainLog.Instance.PasswdPrompt("Password");
+                        firstName = MainLog.Instance.CmdPrompt("First name", "Default");
+                        lastName = MainLog.Instance.CmdPrompt("Last name", "User");
+                        password = MainLog.Instance.PasswdPrompt("Password");
                         regX = Convert.ToUInt32(MainLog.Instance.CmdPrompt("Start Region X", "1000"));
                         regY = Convert.ToUInt32(MainLog.Instance.CmdPrompt("Start Region Y", "1000"));
                     }
                     else
                     {
-                        tempfirstname = cmmdParams[1];
-                        templastname = cmmdParams[2];
-                        tempMD5Passwd = cmmdParams[3];
+                        firstName = cmmdParams[1];
+                        lastName = cmmdParams[2];
+                        password = cmmdParams[3];
                         regX = Convert.ToUInt32(cmmdParams[4]);
                         regY = Convert.ToUInt32(cmmdParams[5]);
 
                     }
 
-                    tempMD5Passwd = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + "");
-
-                    this.UserServices.AddUserProfile(tempfirstname, templastname, tempMD5Passwd, regX, regY);
-                    UserProfileData userProf = this.UserServer.GetUserProfile(tempfirstname, templastname);
-                    if (userProf != null)
-                    {
-                        this.InvenServices.CreateNewUserInventory(userProf.UUID);
-                        Console.WriteLine("Created new inventory set for " + tempfirstname + " " + templastname);
-                    }
+                    AddUser(firstName, lastName, password, regX, regY);
                     break;
             }
         }
 
+        public LLUUID AddUser(string firstName, string lastName, string password, uint regX, uint regY)
+        {
+            string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + "");
+
+            this.UserServices.AddUserProfile(firstName, lastName, md5PasswdHash, regX, regY);
+            UserProfileData userProf = this.UserServer.GetUserProfile(firstName, lastName);
+            if (userProf == null)
+            {
+                return LLUUID.Zero;
+            }
+            else 
+            {
+                this.InvenServices.CreateNewUserInventory(userProf.UUID);
+                Console.WriteLine("Created new inventory set for " + firstName + " " + lastName);
+                return userProf.UUID;
+            }
+        }
+
         public class LocalSettings
         {
             public string WelcomeMessage = "";