Deleted some files that are no longer in use. (I am sure I deleted these yesterday but they seem to have returned).

7 files changed, 44 insertions, 1532 deletions

diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index 3b938cb..7ebe0ee 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

@@ -6,7 +6,8 @@
     <ProjectGuid>{8ACA2445-0000-0000-0000-000000000000}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon></ApplicationIcon>

+    <ApplicationIcon>

+    </ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenSim.Framework</AssemblyName>

@@ -15,9 +16,11 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

+    <AppDesignerFolder>

+    </AppDesignerFolder>

     <RootNamespace>OpenSim.Framework</RootNamespace>

-    <StartupObject></StartupObject>

+    <StartupObject>

+    </StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

@@ -28,7 +31,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

@@ -37,7 +41,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

@@ -46,7 +51,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -55,22 +61,23 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="Db4objects.Db4o.dll" >

+    <Reference Include="Db4objects.Db4o.dll">

       <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="libsecondlife.dll" >

+    <Reference Include="libsecondlife.dll">

       <HintPath>..\..\bin\libsecondlife.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System" >

+    <Reference Include="System">

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml" >

+    <Reference Include="System.Xml">

       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

@@ -80,13 +87,13 @@
       <Name>OpenSim.Framework.Console</Name>

       <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">

       <Name>XMLRPC</Name>

       <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

@@ -123,12 +130,6 @@
     <Compile Include="UserProfile.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UserProfileManager.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="UserProfileManagerBase.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="Util.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -218,4 +219,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>

+</Project>
\ No newline at end of file
diff --git a/Common/OpenSim.Framework/UserProfileManager.cs b/Common/OpenSim.Framework/UserProfileManager.cs
deleted file mode 100644
index 64e830f..0000000
--- a/Common/OpenSim.Framework/UserProfileManager.cs
+++ /dev/null
@@ -1,299 +0,0 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.org/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-using System;

-using System.Collections.Generic;

-using System.Collections;

-using System.Text;

-using System.Text.RegularExpressions;

-using System.Xml;

-using libsecondlife;

-using Nwc.XmlRpc;

-using OpenSim.Framework.Sims;

-using OpenSim.Framework.Inventory;

-using OpenSim.Framework.Utilities;

-

-namespace OpenSim.Framework.User

-{

-    public class UserProfileManager : UserProfileManagerBase

-    {

-        public string GridURL;

-        public string GridSendKey;

-        public string GridRecvKey;

-        public string DefaultStartupMsg;

-

-        public UserProfileManager()

-        {

-

-        }

-

-        public void SetKeys(string sendKey, string recvKey, string url, string message)

-        {

-            GridRecvKey = recvKey;

-            GridSendKey = sendKey;

-            GridURL = url;

-            DefaultStartupMsg = message;

-        }

-

-        public virtual string ParseXMLRPC(string requestBody)

-        {

-

-            XmlRpcRequest request = (XmlRpcRequest)(new XmlRpcRequestDeserializer()).Deserialize(requestBody);

-

-            switch (request.MethodName)

-            {

-                case "login_to_simulator":

-                    XmlRpcResponse response = XmlRpcLoginMethod(request);

-

-                    return (Regex.Replace(XmlRpcResponseSerializer.Singleton.Serialize(response), "utf-16", "utf-8"));

-            }

-

-            return "";

-        }

-

-        public string RestDeleteUserSessionMethod( string request, string path, string param )

-        {

-            LLUUID sessionid = new LLUUID(param);       // get usersessions/sessionid

-            foreach (libsecondlife.LLUUID UUID in UserProfiles.Keys)

-            {

-                if ( UserProfiles[UUID].CurrentSessionID == sessionid)

-                {

-                     UserProfiles[UUID].CurrentSessionID = null;

-                     UserProfiles[UUID].CurrentSecureSessionID = null;

-                     UserProfiles[UUID].Circuits.Clear();

-                }

-            }

-

-            return "OK";

-        }

-

-        public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)

-        {

-            XmlRpcResponse response = new XmlRpcResponse();

-            Hashtable requestData = (Hashtable)request.Params[0];

-

-            bool GoodXML = (requestData.Contains("first") && requestData.Contains("last") && requestData.Contains("passwd"));

-            bool GoodLogin = false;

-            string firstname = "";

-            string lastname = "";

-            string passwd = "";

-

-            if (GoodXML)

-            {

-                firstname = (string)requestData["first"];

-                lastname = (string)requestData["last"];

-                passwd = (string)requestData["passwd"];

-                GoodLogin = AuthenticateUser(firstname, lastname, passwd);

-            }

-

-

-            if (!(GoodXML && GoodLogin))

-            {

-                response = CreateErrorConnectingToGridResponse();

-            }

-            else

-            {

-                UserProfile TheUser = GetProfileByName(firstname, lastname);

-                //we need to sort out how sessions are logged out , currently the sim tells the gridserver

-                //but if as this suggests the userserver handles it then please have the sim telling the userserver instead

-                //as it really makes things messy for sandbox mode

-                //if (!((TheUser.CurrentSessionID == null) && (TheUser.CurrentSecureSessionID == null)))

-                // {

-                //   response = CreateAlreadyLoggedInResponse();

-                // }

-                //else

-                //{

-                try

-                {

-                    Hashtable responseData = new Hashtable();

-

-                    LLUUID AgentID = TheUser.UUID;

-                    TheUser.InitSessionData();

-

-                    //for loading data from a grid server, make any changes in CustomiseResponse() (or create a sub class of this and override that method)

-                   //SimProfile SimInfo = new SimProfile();

-                    //SimInfo = SimInfo.LoadFromGrid(TheUser.homeregionhandle, GridURL, GridSendKey, GridRecvKey);

-

-

-                    Hashtable GlobalT = new Hashtable();

-                    GlobalT["sun_texture_id"] = "cce0f112-878f-4586-a2e2-a8f104bba271";

-                    GlobalT["cloud_texture_id"] = "fc4b9f0b-d008-45c6-96a4-01dd947ac621";

-                    GlobalT["moon_texture_id"] = "fc4b9f0b-d008-45c6-96a4-01dd947ac621";

-                    ArrayList GlobalTextures = new ArrayList();

-                    GlobalTextures.Add(GlobalT);

-

-                    Hashtable LoginFlagsHash = new Hashtable();

-                    LoginFlagsHash["daylight_savings"] = "N";

-                    LoginFlagsHash["stipend_since_login"] = "N";

-                    LoginFlagsHash["gendered"] = "Y";

-                    LoginFlagsHash["ever_logged_in"] = "Y";

-                    ArrayList LoginFlags = new ArrayList();

-                    LoginFlags.Add(LoginFlagsHash);

-

-                    Hashtable uiconfig = new Hashtable();

-                    uiconfig["allow_first_life"] = "Y";

-                    ArrayList ui_config = new ArrayList();

-                    ui_config.Add(uiconfig);

-

-                    Hashtable ClassifiedCategoriesHash = new Hashtable();

-                    ClassifiedCategoriesHash["category_name"] = "bla bla";

-                    ClassifiedCategoriesHash["category_id"] = (Int32)1;

-                    ArrayList ClassifiedCategories = new ArrayList();

-                    ClassifiedCategories.Add(ClassifiedCategoriesHash);

-

-                    ArrayList AgentInventory = new ArrayList();

-                    System.Console.WriteLine("adding inventory to response");

-                    Hashtable TempHash;

-                    foreach (InventoryFolder InvFolder in TheUser.Inventory.InventoryFolders.Values)

-                    {

-                        TempHash = new Hashtable();

-                        System.Console.WriteLine("adding folder " + InvFolder.FolderName + ", ID: " + InvFolder.FolderID.ToStringHyphenated() + " with parent: " + InvFolder.ParentID.ToStringHyphenated()); 

-                        TempHash["name"] = InvFolder.FolderName;

-                        TempHash["parent_id"] = InvFolder.ParentID.ToStringHyphenated();

-                        TempHash["version"] = (Int32)InvFolder.Version;

-                        TempHash["type_default"] = (Int32)InvFolder.DefaultType;

-                        TempHash["folder_id"] = InvFolder.FolderID.ToStringHyphenated();

-                        AgentInventory.Add(TempHash);

-                    }

-

-                    Hashtable InventoryRootHash = new Hashtable();

-                    InventoryRootHash["folder_id"] = TheUser.Inventory.InventoryRoot.FolderID.ToStringHyphenated();

-                    ArrayList InventoryRoot = new ArrayList();

-                    InventoryRoot.Add(InventoryRootHash);

-

-                    Hashtable InitialOutfitHash = new Hashtable();

-                    InitialOutfitHash["folder_name"] = "Nightclub Female";

-                    InitialOutfitHash["gender"] = "female";

-                    ArrayList InitialOutfit = new ArrayList();

-                    InitialOutfit.Add(InitialOutfitHash);

-

-                    uint circode = (uint)(Util.RandomClass.Next());

-                    //TheUser.AddSimCircuit(circode, SimInfo.UUID);

-

-                    responseData["last_name"] = TheUser.lastname;

-                    responseData["ui-config"] = ui_config;

-                    responseData["sim_ip"] = "127.0.0.1"; //SimInfo.sim_ip.ToString();

-                    responseData["login-flags"] = LoginFlags;

-                    responseData["global-textures"] = GlobalTextures;

-                    responseData["classified_categories"] = ClassifiedCategories;

-                    responseData["event_categories"] = new ArrayList();

-                    responseData["inventory-skeleton"] = AgentInventory;

-                    responseData["inventory-skel-lib"] = new ArrayList();

-                    responseData["inventory-root"] = InventoryRoot;

-                    responseData["event_notifications"] = new ArrayList();

-                    responseData["gestures"] = new ArrayList();

-                    responseData["inventory-lib-owner"] = new ArrayList();

-                    responseData["initial-outfit"] = InitialOutfit;

-                    responseData["seconds_since_epoch"] = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;

-                    responseData["start_location"] = "last";

-                    responseData["home"] = "{'region_handle':[r" + (0 * 256).ToString() + ",r" + (0 * 256).ToString() + "], 'position':[r" + TheUser.homepos.X.ToString() + ",r" + TheUser.homepos.Y.ToString() + ",r" + TheUser.homepos.Z.ToString() + "], 'look_at':[r" + TheUser.homelookat.X.ToString() + ",r" + TheUser.homelookat.Y.ToString() + ",r" + TheUser.homelookat.Z.ToString() + "]}";

-                    responseData["message"] = DefaultStartupMsg;

-                    responseData["first_name"] = TheUser.firstname;

-                    responseData["circuit_code"] = (Int32)circode;

-                    responseData["sim_port"] = 0; //(Int32)SimInfo.sim_port;

-                    responseData["secure_session_id"] = TheUser.CurrentSecureSessionID.ToStringHyphenated();

-                    responseData["look_at"] = "\n[r" + TheUser.homelookat.X.ToString() + ",r" + TheUser.homelookat.Y.ToString() + ",r" + TheUser.homelookat.Z.ToString() + "]\n";

-                    responseData["agent_id"] = AgentID.ToStringHyphenated();

-                    responseData["region_y"] = (Int32)0 * 256; // (Int32)SimInfo.RegionLocY * 256;

-                    responseData["region_x"] = (Int32)0 * 256;  //SimInfo.RegionLocX * 256;

-                    responseData["seed_capability"] = "";

-                    responseData["agent_access"] = "M";

-                    responseData["session_id"] = TheUser.CurrentSessionID.ToStringHyphenated();

-                    responseData["login"] = "true";

-

-                    this.CustomiseResponse(ref responseData, TheUser);

-                    response.Value = responseData;

- //                   TheUser.SendDataToSim(SimInfo);

-                    return response;

-

-                }

-                catch (Exception E)

-                {

-                    System.Console.WriteLine(E.ToString());

-                }

-                //}

-            }

-            return response;

-

-        }

-

-        private static XmlRpcResponse CreateErrorConnectingToGridResponse()

-        {

-            XmlRpcResponse response = new XmlRpcResponse();

-            Hashtable ErrorRespData = new Hashtable();

-            ErrorRespData["reason"] = "key";

-            ErrorRespData["message"] = "Error connecting to grid. Please double check your login details and check with the grid owner if you are sure these are correct";

-            ErrorRespData["login"] = "false";

-            response.Value = ErrorRespData;

-            return response;

-        }

-

-        private static XmlRpcResponse CreateAlreadyLoggedInResponse()

-        {

-            XmlRpcResponse response = new XmlRpcResponse();

-            Hashtable PresenceErrorRespData = new Hashtable();

-            PresenceErrorRespData["reason"] = "presence";

-            PresenceErrorRespData["message"] = "You appear to be already logged in, if this is not the case please wait for your session to timeout, if this takes longer than a few minutes please contact the grid owner";

-            PresenceErrorRespData["login"] = "false";

-            response.Value = PresenceErrorRespData;

-            return response;

-        }

-

-        public virtual void CustomiseResponse(ref Hashtable response, UserProfile theUser)

-        {

-            //default method set up to act as ogs user server

-            SimProfile SimInfo= new SimProfile();

-            //get siminfo from grid server

-            SimInfo = SimInfo.LoadFromGrid(theUser.homeregionhandle, GridURL, GridSendKey, GridRecvKey);

-            Int32 circode = (Int32)Convert.ToUInt32(response["circuit_code"]);

-            theUser.AddSimCircuit((uint)circode, SimInfo.UUID);

-            response["home"] = "{'region_handle':[r" + (SimInfo.RegionLocX * 256).ToString() + ",r" + (SimInfo.RegionLocY * 256).ToString() + "], 'position':[r" + theUser.homepos.X.ToString() + ",r" + theUser.homepos.Y.ToString() + ",r" + theUser.homepos.Z.ToString() + "], 'look_at':[r" + theUser.homelookat.X.ToString() + ",r" + theUser.homelookat.Y.ToString() + ",r" + theUser.homelookat.Z.ToString() + "]}";

-            response["sim_ip"] = SimInfo.sim_ip;

-            response["sim_port"] = (Int32)SimInfo.sim_port;

-            response["region_y"] = (Int32)SimInfo.RegionLocY * 256;

-            response["region_x"] = (Int32)SimInfo.RegionLocX * 256;

-

-            //default is ogs user server, so let the sim know about the user via a XmlRpcRequest

-            System.Console.WriteLine(SimInfo.caps_url);

-            Hashtable SimParams = new Hashtable();

-            SimParams["session_id"] = theUser.CurrentSessionID.ToString();

-            SimParams["secure_session_id"] = theUser.CurrentSecureSessionID.ToString();

-            SimParams["firstname"] = theUser.firstname;

-            SimParams["lastname"] = theUser.lastname;

-            SimParams["agent_id"] = theUser.UUID.ToString();

-            SimParams["circuit_code"] = (Int32)circode;

-                SimParams["startpos_x"] = theUser.homepos.X.ToString();

-                SimParams["startpos_y"] = theUser.homepos.Y.ToString();

-                SimParams["startpos_z"] = theUser.homepos.Z.ToString();

-            ArrayList SendParams = new ArrayList();

-            SendParams.Add(SimParams);

-

-            XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);

-            XmlRpcResponse GridResp = GridReq.Send(SimInfo.caps_url, 3000);

-        }

-    }

-}

diff --git a/Common/OpenSim.Framework/UserProfileManagerBase.cs b/Common/OpenSim.Framework/UserProfileManagerBase.cs
deleted file mode 100644
index 638077e..0000000
--- a/Common/OpenSim.Framework/UserProfileManagerBase.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.org/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-using System;

-using System.Collections.Generic;

-using System.Text;

-using libsecondlife;

-using OpenSim.Framework.Utilities;

-using OpenSim.Framework.Inventory;

-using Db4objects.Db4o;

-

-namespace OpenSim.Framework.User

-{

-    public class UserProfileManagerBase

-    {

-

-        public Dictionary<LLUUID, UserProfile> UserProfiles = new Dictionary<LLUUID, UserProfile>();

-

-        public UserProfileManagerBase()

-        {

-        }

-

-        public virtual void InitUserProfiles()

-        {

-            IObjectContainer db;

-            db = Db4oFactory.OpenFile("userprofiles.yap");

-            IObjectSet result = db.Get(typeof(UserProfile));

-            foreach (UserProfile userprof in result)

-            {

-                UserProfiles.Add(userprof.UUID, userprof);

-            }

-            System.Console.WriteLine("UserProfiles.Cs:InitUserProfiles() - Successfully loaded " + result.Count.ToString() + " from database");

-            db.Close();

-        }

-

-        public virtual void SaveUserProfiles()          // ZOMG! INEFFICIENT!

-        {

-            IObjectContainer db;

-            db = Db4oFactory.OpenFile("userprofiles.yap");

-            IObjectSet result = db.Get(typeof(UserProfile));

-            foreach (UserProfile userprof in result)

-            {

-                db.Delete(userprof);

-                db.Commit();

-            }

-            foreach (UserProfile userprof in UserProfiles.Values)

-            {

-                db.Set(userprof);

-                db.Commit();

-            }

-            db.Close();

-        }

-

-        public UserProfile GetProfileByName(string firstname, string lastname)

-        {

-            foreach (libsecondlife.LLUUID UUID in UserProfiles.Keys)

-            {

-                if (UserProfiles[UUID].firstname.Equals(firstname)) if (UserProfiles[UUID].lastname.Equals(lastname))

-                {

-                    return UserProfiles[UUID];

-                }

-            }

-            return null;

-        }

-

-        public UserProfile GetProfileByLLUUID(LLUUID ProfileLLUUID)

-        {

-            return UserProfiles[ProfileLLUUID];

-        }

-

-        public virtual bool AuthenticateUser(string firstname, string lastname, string passwd)

-        {

-            UserProfile TheUser = GetProfileByName(firstname, lastname);

-            passwd = passwd.Remove(0, 3); //remove $1$

-            if (TheUser != null)

-            {

-                if (TheUser.MD5passwd == passwd)

-                {

-                    System.Console.WriteLine("UserProfile - authorised " + firstname + " " + lastname);

-                    return true;

-                }

-                else

-                {

-                    System.Console.WriteLine("UserProfile - not authorised, password not match " + TheUser.MD5passwd + " and " + passwd);

-                    return false;

-                }

-            }

-            else

-            {

-                System.Console.WriteLine("UserProfile - not authorised , unkown: " + firstname + " , " + lastname);

-                return false;

-            }

-

-        }

-

-        public void SetGod(LLUUID GodID)

-        {

-            this.UserProfiles[GodID].IsGridGod = true;

-        }

-

-        public virtual UserProfile CreateNewProfile(string firstname, string lastname, string MD5passwd)

-        {

-            System.Console.WriteLine("creating new profile for : " + firstname + " , " + lastname);

-            UserProfile newprofile = new UserProfile();

-            newprofile.homeregionhandle = Helpers.UIntsToLong((997 * 256), (996 * 256));

-            newprofile.firstname = firstname;

-            newprofile.lastname = lastname;

-            newprofile.MD5passwd = MD5passwd;

-            newprofile.UUID = LLUUID.Random();

-            newprofile.Inventory.CreateRootFolder(newprofile.UUID, true);

-            this.UserProfiles.Add(newprofile.UUID, newprofile);

-            return newprofile;

-        }

-

-        public virtual AgentInventory GetUsersInventory(LLUUID agentID)

-        {

-            UserProfile user = this.GetProfileByLLUUID(agentID);

-            if (user != null)

-            {

-                return user.Inventory;

-            }

-

-            return null;

-        }

-

-    }

-}

diff --git a/Common/OpenSim.Servers/LocalUserProfileManager.cs b/Common/OpenSim.Servers/LocalUserProfileManager.cs
deleted file mode 100644
index 773de5a..0000000
--- a/Common/OpenSim.Servers/LocalUserProfileManager.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.org/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-

-using System;

-using System.Collections.Generic;

-using System.Collections;

-using System.Text;

-using OpenSim.Framework.User;

-using OpenSim.Framework.Grid;

-using OpenSim.Framework.Inventory;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Types;

-using libsecondlife;

-

-namespace OpenSim.UserServer

-{

-    public class LocalUserProfileManager : UserProfileManager 

-    {

-       // private IGridServer m_gridServer;

-        private int m_port;

-        private string m_ipAddr;

-        private uint regionX;

-        private uint regionY;

-        private AddNewSessionHandler AddSession;

-

-        public LocalUserProfileManager( int simPort, string ipAddr , uint regX, uint regY)

-                {

-                        

-            m_port = simPort;

-            m_ipAddr = ipAddr;

-            regionX = regX;

-            regionY = regY;

-                }

-

-        public void SetSessionHandler(AddNewSessionHandler sessionHandler)

-        {

-            this.AddSession = sessionHandler;

-        }

-

-        public override void InitUserProfiles()

-        {

-            // TODO: need to load from database

-        }

-

-        public override void CustomiseResponse(ref System.Collections.Hashtable response, UserProfile theUser)

-        {

-            Int32 circode = (Int32)response["circuit_code"];

-            theUser.AddSimCircuit((uint)circode, LLUUID.Random());

-            response["home"] = "{'region_handle':[r" + (997 * 256).ToString() + ",r" + (996 * 256).ToString() + "], 'position':[r" + theUser.homepos.X.ToString() + ",r" + theUser.homepos.Y.ToString() + ",r" + theUser.homepos.Z.ToString() + "], 'look_at':[r" + theUser.homelookat.X.ToString() + ",r" + theUser.homelookat.Y.ToString() + ",r" + theUser.homelookat.Z.ToString() + "]}";

-            response["sim_port"] = m_port;

-            response["sim_ip"] = m_ipAddr;

-            response["region_y"] = (Int32)regionY* 256;

-            response["region_x"] = (Int32)regionX* 256;

-

-            string first;

-            string last;

-            if (response.Contains("first_name"))

-            {

-                first = (string)response["first_name"];

-            }

-            else

-            {

-                first = "test";

-            }

-

-            if (response.Contains("last_name"))

-            {

-                last = (string)response["last_name"];

-            }

-            else

-            {

-                last = "User";

-            }

-

-            ArrayList InventoryList = (ArrayList)response["inventory-skeleton"];

-            Hashtable Inventory1 = (Hashtable)InventoryList[0];

-

-            Login _login = new Login();

-            //copy data to login object

-            _login.First = first;

-            _login.Last = last;

-            _login.Agent = new LLUUID((string)response["agent_id"]) ;

-            _login.Session = new LLUUID((string)response["session_id"]);

-            _login.SecureSession = new LLUUID((string)response["secure_session_id"]);

-            _login.CircuitCode =(uint) circode;

-            _login.BaseFolder = null;

-            _login.InventoryFolder = new LLUUID((string)Inventory1["folder_id"]);

-

-            //working on local computer if so lets add to the gridserver's list of sessions?

-            /*if (m_gridServer.GetName() == "Local")

-            {

-                Console.WriteLine("adding login data to gridserver");

-                ((LocalGridBase)this.m_gridServer).AddNewSession(_login);

-            }*/

-            ulong reghand = Helpers.UIntsToLong((regionX * 256), (regionY * 256));

-            this.AddSession(reghand, _login);

-        }

-    }

-}

diff --git a/Common/OpenSim.Servers/LoginResponse.cs b/Common/OpenSim.Servers/LoginResponse.cs
deleted file mode 100644
index dc4732c..0000000
--- a/Common/OpenSim.Servers/LoginResponse.cs
+++ /dev/null
@@ -1,655 +0,0 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.org/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-

-using Nwc.XmlRpc;

-using System;

-using System.IO;

-using System.Net;

-using System.Net.Sockets;

-using System.Text;

-using System.Text.RegularExpressions;

-using System.Threading;

-using System.Collections;

-using System.Security.Cryptography;

-using System.Xml;

-using libsecondlife;

-using OpenSim;

-using OpenSim.Framework.User;

-using OpenSim.Framework.Inventory;

-using OpenSim.Framework.Utilities;

-using OpenSim.Framework.Interfaces;

-

-// ?

-using OpenSim.Framework.Grid;

-

-namespace OpenSim.UserServer

-{

-    /// <summary>

-    /// A temp class to handle login response.

-    /// Should make use of UserProfileManager where possible.

-    /// </summary>

-

-    public class LoginResponse

-    {

-        private Hashtable loginFlagsHash;

-        private Hashtable globalTexturesHash;

-        private Hashtable loginError;

-        private Hashtable eventCategoriesHash;

-        private Hashtable uiConfigHash;

-        private Hashtable classifiedCategoriesHash;

-

-        private ArrayList loginFlags;

-        private ArrayList globalTextures;

-        private ArrayList eventCategories;

-        private ArrayList uiConfig;

-        private ArrayList classifiedCategories;

-        private ArrayList inventoryRoot;

-        private ArrayList initialOutfit;

-        private ArrayList agentInventory;

-

-        private UserInfo userProfile;

-

-        private LLUUID agentID;

-        private LLUUID sessionID;

-        private LLUUID secureSessionID;

-        private LLUUID baseFolderID;

-        private LLUUID inventoryFolderID;

-

-        // Login Flags

-        private string dst;

-        private string stipendSinceLogin;

-        private string gendered;

-        private string everLoggedIn;

-        private string login;

-        private string simPort;

-        private string simAddress;

-        private string agentAccess;

-        private Int32 circuitCode;

-        private uint regionX;

-        private uint regionY;

-

-        // Login

-        private string firstname;

-        private string lastname;

-

-        // Global Textures

-        private string sunTexture;

-        private string cloudTexture;

-        private string moonTexture;

-

-        // Error Flags

-        private string errorReason;

-        private string errorMessage;

-

-        // Response

-        private XmlRpcResponse xmlRpcResponse;

-        private XmlRpcResponse defaultXmlRpcResponse;

-

-        private string welcomeMessage;

-        private string startLocation;

-        private string allowFirstLife;

-        private string home;

-        private string seedCapability;

-        private string lookAt;

-

-        public LoginResponse()

-        {

-            this.loginFlags = new ArrayList();

-            this.globalTextures = new ArrayList();

-            this.eventCategories = new ArrayList();

-            this.uiConfig = new ArrayList();

-            this.classifiedCategories = new ArrayList();

-

-            this.loginError = new Hashtable();

-            this.eventCategoriesHash = new Hashtable();

-            this.classifiedCategoriesHash = new Hashtable();

-            this.uiConfigHash = new Hashtable();

-

-            this.defaultXmlRpcResponse = new XmlRpcResponse();

-            this.userProfile = new UserInfo();

-            this.inventoryRoot = new ArrayList();

-            this.initialOutfit = new ArrayList();

-            this.agentInventory = new ArrayList();

-

-            this.xmlRpcResponse = new XmlRpcResponse();

-            this.defaultXmlRpcResponse = new XmlRpcResponse();

-

-            this.SetDefaultValues();

-        } // LoginServer

-

-        public void SetDefaultValues()

-        {

-            try

-            {

-                this.DST = "N";

-                this.StipendSinceLogin = "N";

-                this.Gendered = "Y";

-                this.EverLoggedIn = "Y";

-                this.login = "false";

-                this.firstname = "Test";

-                this.lastname = "User";

-                this.agentAccess = "M";

-                this.startLocation = "last";

-                this.allowFirstLife = "Y";

-

-                this.SunTexture = "cce0f112-878f-4586-a2e2-a8f104bba271";

-                this.CloudTexture = "fc4b9f0b-d008-45c6-96a4-01dd947ac621";

-                this.MoonTexture = "fc4b9f0b-d008-45c6-96a4-01dd947ac621";

-

-                this.ErrorMessage = "You have entered an invalid name/password combination.  Check Caps/lock.";

-                this.ErrorReason = "key";

-                this.welcomeMessage = "Welcome to OpenSim!";

-                this.seedCapability = "";

-                this.home = "{'region_handle':[r" + (997 * 256).ToString() + ",r" + (996 * 256).ToString() + "], 'position':[r" + this.userProfile.homepos.X.ToString() + ",r" + this.userProfile.homepos.Y.ToString() + ",r" + this.userProfile.homepos.Z.ToString() + "], 'look_at':[r" + this.userProfile.homelookat.X.ToString() + ",r" + this.userProfile.homelookat.Y.ToString() + ",r" + this.userProfile.homelookat.Z.ToString() + "]}";

-                this.lookAt = "[r0.99949799999999999756,r0.03166859999999999814,r0]";

-                this.RegionX = (uint)255232;

-                this.RegionY = (uint)254976;

-

-                // Classifieds;

-                this.AddClassifiedCategory((Int32)1, "Shopping");

-                this.AddClassifiedCategory((Int32)2, "Land Rental");

-                this.AddClassifiedCategory((Int32)3, "Property Rental");

-                this.AddClassifiedCategory((Int32)4, "Special Attraction");

-                this.AddClassifiedCategory((Int32)5, "New Products");

-                this.AddClassifiedCategory((Int32)6, "Employment");

-                this.AddClassifiedCategory((Int32)7, "Wanted");

-                this.AddClassifiedCategory((Int32)8, "Service");

-                this.AddClassifiedCategory((Int32)9, "Personal");

-

-                this.SessionID = LLUUID.Random();

-                this.SecureSessionID = LLUUID.Random();

-                this.AgentID = LLUUID.Random();

-

-                Hashtable InitialOutfitHash = new Hashtable();

-                InitialOutfitHash["folder_name"] = "Nightclub Female";

-                InitialOutfitHash["gender"] = "female";

-                this.initialOutfit.Add(InitialOutfitHash);

-            }

-            catch (Exception e)

-            {

-                OpenSim.Framework.Console.MainLog.Instance.WriteLine(

-                    OpenSim.Framework.Console.LogPriority.LOW, 

-                    "LoginResponse: Unable to set default values: " + e.Message

-                );

-            }

-

-        } // SetDefaultValues

-

-        private XmlRpcResponse GenerateFailureResponse(string reason, string message, string login)

-        {

-            // Overwrite any default values;

-            this.xmlRpcResponse = new XmlRpcResponse();

-

-            // Ensure Login Failed message/reason;

-            this.ErrorMessage = message;

-            this.ErrorReason = reason;

-

-            this.loginError["reason"] = this.ErrorReason;

-            this.loginError["message"] = this.ErrorMessage;

-            this.loginError["login"] = login;

-            this.xmlRpcResponse.Value = this.loginError;

-            return (this.xmlRpcResponse);

-        } // GenerateResponse

-

-        public XmlRpcResponse LoginFailedResponse()

-        {

-            return (this.GenerateFailureResponse("key", "You have entered an invalid name/password combination.  Check Caps/lock.", "false"));

-        } // LoginFailedResponse

-

-        public XmlRpcResponse ConnectionFailedResponse()

-        {

-            return (this.LoginFailedResponse());

-        } // CreateErrorConnectingToGridResponse()

-

-        public XmlRpcResponse CreateAlreadyLoggedInResponse()

-        {

-            return (this.GenerateFailureResponse("presence", "You appear to be already logged in, if this is not the case please wait for your session to timeout, if this takes longer than a few minutes please contact the grid owner", "false"));

-        } // CreateAlreadyLoggedInResponse()

-

-        public XmlRpcResponse ToXmlRpcResponse()

-        {

-            try

-            {

-

-                Hashtable responseData = new Hashtable();

-

-                this.loginFlagsHash = new Hashtable();

-                this.loginFlagsHash["daylight_savings"] = this.DST;

-                this.loginFlagsHash["stipend_since_login"] = this.StipendSinceLogin;

-                this.loginFlagsHash["gendered"] = this.Gendered;

-                this.loginFlagsHash["ever_logged_in"] = this.EverLoggedIn;

-                this.loginFlags.Add(this.loginFlagsHash);

-

-                responseData["first_name"] = this.Firstname;

-                responseData["last_name"] = this.Lastname;

-                responseData["agent_access"] = this.agentAccess;

-

-                this.globalTexturesHash = new Hashtable();

-                this.globalTexturesHash["sun_texture_id"] = this.SunTexture;

-                this.globalTexturesHash["cloud_texture_id"] = this.CloudTexture;

-                this.globalTexturesHash["moon_texture_id"] = this.MoonTexture;

-                this.globalTextures.Add(this.globalTexturesHash);

-                this.eventCategories.Add(this.eventCategoriesHash);

-

-                this.AddToUIConfig("allow_first_life", this.allowFirstLife);

-                this.uiConfig.Add(this.uiConfigHash);

-

-                responseData["sim_port"] = this.SimPort;

-                responseData["sim_ip"] = this.SimAddress;

-                responseData["agent_id"] = this.AgentID.ToStringHyphenated();

-                responseData["session_id"] = this.SessionID.ToStringHyphenated();

-                responseData["secure_session_id"] = this.SecureSessionID.ToStringHyphenated();

-                responseData["circuit_code"] = this.CircuitCode;

-                responseData["seconds_since_epoch"] = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;

-                responseData["login-flags"] = this.loginFlags;

-                responseData["global-textures"] = this.globalTextures;

-                responseData["seed_capability"] = this.seedCapability;

-

-                responseData["event_categories"] = this.eventCategories;

-                responseData["event_notifications"] = new ArrayList(); // todo

-                responseData["classified_categories"] = this.classifiedCategories;

-                responseData["ui-config"] = this.uiConfig;

-

-                responseData["inventory-skeleton"] = this.agentInventory;

-                responseData["inventory-skel-lib"] = new ArrayList(); // todo

-                responseData["inventory-root"] = this.inventoryRoot;

-                responseData["gestures"] = new ArrayList(); // todo

-                responseData["inventory-lib-owner"] = new ArrayList(); // todo

-                responseData["initial-outfit"] = this.initialOutfit;

-                responseData["start_location"] = this.startLocation;

-                responseData["seed_capability"] = this.seedCapability;

-                responseData["home"] = this.home;

-                responseData["look_at"] = this.lookAt;

-                responseData["message"] = this.welcomeMessage;

-                responseData["region_x"] = (Int32)this.RegionX * 256;

-                responseData["region_y"] = (Int32)this.RegionY * 256;

-

-                //responseData["inventory-lib-root"] = new ArrayList(); // todo

-                //responseData["buddy-list"] = new ArrayList(); // todo

-

-                responseData["login"] = "true";

-                this.xmlRpcResponse.Value = responseData;

-

-                return (this.xmlRpcResponse);

-            }

-            catch (Exception e)

-            {

-                OpenSim.Framework.Console.MainLog.Instance.WriteLine(

-                    OpenSim.Framework.Console.LogPriority.LOW,

-                    "LoginResponse: Error creating XML-RPC Response: " + e.Message

-                );

-                return (this.GenerateFailureResponse("Internal Error", "Error generating Login Response", "false"));

-

-            }

-

-        } // ToXmlRpcResponse

-

-        public void SetEventCategories(string category, string value)

-        {

-            this.eventCategoriesHash[category] = value;

-        } // SetEventCategories

-

-        public void AddToUIConfig(string itemName, string item)

-        {

-            this.uiConfigHash[itemName] = item;

-        } // SetUIConfig

-

-        public void AddClassifiedCategory(Int32 ID, string categoryName)

-        {

-            this.classifiedCategoriesHash["category_name"] = categoryName;

-            this.classifiedCategoriesHash["category_id"] = ID;

-            this.classifiedCategories.Add(this.classifiedCategoriesHash);

-            // this.classifiedCategoriesHash.Clear();

-        } // SetClassifiedCategory

-

-        #region Properties

-        public string Login

-        {

-            get

-            {

-                return this.login;

-            }

-            set

-            {

-                this.login = value;

-            }

-        } // Login

-

-        public string DST

-        {

-            get

-            {

-                return this.dst;

-            }

-            set

-            {

-                this.dst = value;

-            }

-        } // DST

-

-        public string StipendSinceLogin

-        {

-            get

-            {

-                return this.stipendSinceLogin;

-            }

-            set

-            {

-                this.stipendSinceLogin = value;

-            }

-        } // StipendSinceLogin

-

-        public string Gendered

-        {

-            get

-            {

-                return this.gendered;

-            }

-            set

-            {

-                this.gendered = value;

-            }

-        } // Gendered

-

-        public string EverLoggedIn

-        {

-            get

-            {

-                return this.everLoggedIn;

-            }

-            set

-            {

-                this.everLoggedIn = value;

-            }

-        } // EverLoggedIn

-

-        public string SimPort

-        {

-            get

-            {

-                return this.simPort;

-            }

-            set

-            {

-                this.simPort = value;

-            }

-        } // SimPort

-

-        public string SimAddress

-        {

-            get

-            {

-                return this.simAddress;

-            }

-            set

-            {

-                this.simAddress = value;

-            }

-        } // SimAddress

-

-        public LLUUID AgentID

-        {

-            get

-            {

-                return this.agentID;

-            }

-            set

-            {

-                this.agentID = value;

-            }

-        } // AgentID

-

-        public LLUUID SessionID

-        {

-            get

-            {

-                return this.sessionID;

-            }

-            set

-            {

-                this.sessionID = value;

-            }

-        } // SessionID

-

-        public LLUUID SecureSessionID

-        {

-            get

-            {

-                return this.secureSessionID;

-            }

-            set

-            {

-                this.secureSessionID = value;

-            }

-        } // SecureSessionID

-

-        public LLUUID BaseFolderID

-        {

-            get

-            {

-                return this.baseFolderID;

-            }

-            set

-            {

-                this.baseFolderID = value;

-            }

-        } // BaseFolderID

-

-        public LLUUID InventoryFolderID

-        {

-            get

-            {

-                return this.inventoryFolderID;

-            }

-            set

-            {

-                this.inventoryFolderID = value;

-            }

-        } // InventoryFolderID

-

-        public Int32 CircuitCode

-        {

-            get

-            {

-                return this.circuitCode;

-            }

-            set

-            {

-                this.circuitCode = value;

-            }

-        } // CircuitCode

-

-        public uint RegionX

-        {

-            get

-            {

-                return this.regionX;

-            }

-            set

-            {

-                this.regionX = value;

-            }

-        } // RegionX

-

-        public uint RegionY

-        {

-            get

-            {

-                return this.regionY;

-            }

-            set

-            {

-                this.regionY = value;

-            }

-        } // RegionY

-

-        public string SunTexture

-        {

-            get

-            {

-                return this.sunTexture;

-            }

-            set

-            {

-                this.sunTexture = value;

-            }

-        } // SunTexture

-

-        public string CloudTexture

-        {

-            get

-            {

-                return this.cloudTexture;

-            }

-            set

-            {

-                this.cloudTexture = value;

-            }

-        } // CloudTexture

-

-        public string MoonTexture

-        {

-            get

-            {

-                return this.moonTexture;

-            }

-            set

-            {

-                this.moonTexture = value;

-            }

-        } // MoonTexture

-

-        public string Firstname

-        {

-            get

-            {

-                return this.firstname;

-            }

-            set

-            {

-                this.firstname = value;

-            }

-        } // Firstname

-

-        public string Lastname

-        {

-            get

-            {

-                return this.lastname;

-            }

-            set

-            {

-                this.lastname = value;

-            }

-        } // Lastname

-

-        public string AgentAccess

-        {

-            get

-            {

-                return this.agentAccess;

-            }

-            set

-            {

-                this.agentAccess = value;

-            }

-        }

-

-        public string StartLocation

-        {

-            get

-            {

-                return this.startLocation;

-            }

-            set

-            {

-                this.startLocation = value;

-            }

-        } // StartLocation

-

-        public string LookAt

-        {

-            get

-            {

-                return this.lookAt;

-            }

-            set

-            {

-                this.lookAt = value;

-            }

-        }

-

-        public string SeedCapability

-        {

-            get

-            {

-                return this.seedCapability;

-            }

-            set

-            {

-                this.seedCapability = value;

-            }

-        } // SeedCapability

-

-        public string ErrorReason

-        {

-            get

-            {

-                return this.errorReason;

-            }

-            set

-            {

-                this.errorReason = value;

-            }

-        } // ErrorReason

-

-        public string ErrorMessage

-        {

-            get

-            {

-                return this.errorMessage;

-            }

-            set

-            {

-                this.errorMessage = value;

-            }

-        } // ErrorMessage

-

-        #endregion

-

-

-        public class UserInfo

-        {

-            public string firstname;

-            public string lastname;

-            public ulong homeregionhandle;

-            public LLVector3 homepos;

-            public LLVector3 homelookat;

-        }

-    } 

-} 
\ No newline at end of file
diff --git a/Common/OpenSim.Servers/LoginServer.cs b/Common/OpenSim.Servers/LoginServer.cs
deleted file mode 100644
index e5373dd..0000000
--- a/Common/OpenSim.Servers/LoginServer.cs
+++ /dev/null
@@ -1,258 +0,0 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.org/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-using Nwc.XmlRpc;

-using System;

-using System.IO;

-using System.Net;

-using System.Net.Sockets;

-using System.Text;

-using System.Text.RegularExpressions;

-using System.Threading;

-using System.Collections;

-using System.Security.Cryptography;

-using System.Xml;

-using libsecondlife;

-using OpenSim;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Grid;

-using OpenSim.Framework.Inventory;

-using OpenSim.Framework.User;

-using OpenSim.Framework.Utilities;

-using OpenSim.Framework.Types;

-

-namespace OpenSim.UserServer

-{

-    public delegate bool AddNewSessionHandler(ulong regionHandle, Login loginData);

-    /// <summary>

-    /// When running in local (default) mode , handles client logins.

-    /// </summary>

-    public class LoginServer : LoginService, IUserServer

-    {

-       //private IGridServer m_gridServer;

-        public IPAddress clientAddress = IPAddress.Loopback;

-        public IPAddress remoteAddress = IPAddress.Any;

-        private int NumClients;

-        private bool userAccounts = false;

-        private string _mpasswd;

-        private bool _needPasswd = false;

-        private LocalUserProfileManager userManager;

-        private int m_simPort;

-        private string m_simAddr;

-        private uint regionX;

-        private uint regionY;

-        private AddNewSessionHandler AddSession;

-

-        public LocalUserProfileManager LocalUserManager

-        {

-            get

-            {

-                return userManager;

-            }

-        }

-

-        public LoginServer( string simAddr, int simPort, uint regX, uint regY, bool useAccounts)

-        {

-            m_simPort = simPort;

-            m_simAddr = simAddr;

-            regionX = regX;

-            regionY = regY;

-            this.userAccounts = useAccounts;

-        }

-

-        public void SetSessionHandler(AddNewSessionHandler sessionHandler)

-        {

-            this.AddSession = sessionHandler;

-            this.userManager.SetSessionHandler(sessionHandler);

-        }

-

-        public void Startup()

-        {

-            this._needPasswd = false;

-

-            this._mpasswd = EncodePassword("testpass");

-

-            userManager = new LocalUserProfileManager( m_simPort, m_simAddr, regionX, regionY);

-            //userManager.InitUserProfiles();

-            userManager.SetKeys("", "", "", "Welcome to OpenSim");

-        }

-

-        public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)

-        {

-            Console.WriteLine("login attempt");

-            Hashtable requestData = (Hashtable)request.Params[0];

-            string first;

-            string last;

-            string passwd;

-

-            LoginResponse loginResponse = new LoginResponse();

-            loginResponse.RegionX = regionX;

-            loginResponse.RegionY = regionY;

-

-            //get login name

-            if (requestData.Contains("first"))

-            {

-                first = (string)requestData["first"];

-            }

-            else

-            {

-                first = "test";

-            }

-

-            if (requestData.Contains("last"))

-            {

-                last = (string)requestData["last"];

-            }

-            else

-            {

-                last = "User" + NumClients.ToString();

-            }

-

-            if (requestData.Contains("passwd"))

-            {

-                passwd = (string)requestData["passwd"];

-            }

-            else

-            {

-                passwd = "notfound";

-            }

-

-            if (!Authenticate(first, last, passwd))

-            {

-                return loginResponse.LoginFailedResponse();

-            }

-

-            NumClients++;

-

-            loginResponse.SimPort = m_simPort.ToString();

-            loginResponse.SimAddress = m_simAddr.ToString();

-            

-            loginResponse.CircuitCode = (Int32)(Util.RandomClass.Next());

-            XmlRpcResponse response = loginResponse.ToXmlRpcResponse();

-            Hashtable responseData = (Hashtable)response.Value;

-

-          

-            CustomiseLoginResponse(responseData, first, last);

-

-            Login _login = new Login();

-            //copy data to login object

-            _login.First = first;

-            _login.Last = last;

-            _login.Agent = loginResponse.AgentID;

-            _login.Session = loginResponse.SessionID;

-            _login.SecureSession = loginResponse.SecureSessionID;

-            _login.CircuitCode = (uint) loginResponse.CircuitCode;

-            _login.BaseFolder = loginResponse.BaseFolderID;

-            _login.InventoryFolder = loginResponse.InventoryFolderID;

-

-            ulong reghand = Helpers.UIntsToLong((regionX * 256), (regionY * 256));

-            AddSession(reghand,_login);

-

-            return response;

-        }

-

-        protected virtual void CustomiseLoginResponse(Hashtable responseData, string first, string last)

-        {

-        }

-

-        protected virtual LLUUID GetAgentId(string firstName, string lastName)

-        {

-            LLUUID Agent;

-            int AgentRand = Util.RandomClass.Next(1, 9999);

-            Agent = new LLUUID("99998888-0100-" + AgentRand.ToString("0000") + "-8ec1-0b1d5cd6aead");

-            return Agent;

-        }

-

-        protected virtual bool Authenticate(string first, string last, string passwd)

-        {

-            if (this._needPasswd)

-            {

-                //every user needs the password to login

-                string encodedPass = passwd.Remove(0, 3); //remove $1$

-                if (encodedPass == this._mpasswd)

-                {

-                    return true;

-                }

-                else

-                {

-                    return false;

-                }

-            }

-            else

-            {

-                //do not need password to login

-                return true;

-            }

-        }

-

-        private static string EncodePassword(string passwd)

-        {

-            Byte[] originalBytes;

-            Byte[] encodedBytes;

-            MD5 md5;

-

-            md5 = new MD5CryptoServiceProvider();

-            originalBytes = ASCIIEncoding.Default.GetBytes(passwd);

-            encodedBytes = md5.ComputeHash(originalBytes);

-

-            return Regex.Replace(BitConverter.ToString(encodedBytes), "-", "").ToLower();

-        }

-

-        public bool CreateUserAccount(string firstName, string lastName, string password)

-        {

-            Console.WriteLine("creating new user account");

-            string mdPassword = EncodePassword(password);

-            Console.WriteLine("with password: " + mdPassword);

-            this.userManager.CreateNewProfile(firstName, lastName, mdPassword);

-            return true;

-        }

-

-        //IUserServer implementation

-        public AgentInventory RequestAgentsInventory(LLUUID agentID)

-        {

-            AgentInventory aInventory = null;

-            if (this.userAccounts)

-            {

-                aInventory = this.userManager.GetUsersInventory(agentID);

-            }

-

-            return aInventory;

-        }

-

-        public bool UpdateAgentsInventory(LLUUID agentID, AgentInventory inventory)

-        {

-            return true;

-        }

-

-        public void SetServerInfo(string ServerUrl, string SendKey, string RecvKey)

-        {

-

-        }

-    }

-

-

-}

diff --git a/Common/OpenSim.Servers/OpenSim.Servers.csproj b/Common/OpenSim.Servers/OpenSim.Servers.csproj
index e9be796..6e8eba7 100644
--- a/Common/OpenSim.Servers/OpenSim.Servers.csproj
+++ b/Common/OpenSim.Servers/OpenSim.Servers.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

@@ -6,7 +6,8 @@
     <ProjectGuid>{8BB20F0A-0000-0000-0000-000000000000}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon></ApplicationIcon>

+    <ApplicationIcon>

+    </ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenSim.Servers</AssemblyName>

@@ -15,9 +16,11 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

+    <AppDesignerFolder>

+    </AppDesignerFolder>

     <RootNamespace>OpenSim.Servers</RootNamespace>

-    <StartupObject></StartupObject>

+    <StartupObject>

+    </StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

@@ -28,7 +31,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

@@ -37,7 +41,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

@@ -46,7 +51,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -55,18 +61,19 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="libsecondlife.dll" >

+    <Reference Include="libsecondlife.dll">

       <HintPath>..\..\bin\libsecondlife.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System" >

+    <Reference Include="System">

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml" >

+    <Reference Include="System.Xml">

       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

@@ -76,19 +83,19 @@
       <Name>OpenSim.Framework</Name>

       <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">

       <Name>OpenSim.Framework.Console</Name>

       <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">

       <Name>XMLRPC</Name>

       <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

@@ -101,15 +108,6 @@
     <Compile Include="IRestHandler.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="LocalUserProfileManager.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="LoginResponse.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="LoginServer.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="UDPServerBase.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -124,4 +122,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>

+</Project>
\ No newline at end of file