14 files changed, 142 insertions, 932 deletions

diff --git a/OpenGridServices.sln b/OpenGridServices.sln
index 641f710..3996190 100644
--- a/OpenGridServices.sln
+++ b/OpenGridServices.sln
@@ -10,8 +10,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.SQL
 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.DB4o", "OpenGridServices\OpenGrid.Framework.Data.DB4o\OpenGrid.Framework.Data.DB4o.csproj", "{39BD9497-0000-0000-0000-000000000000}"

 EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceManager", "OpenGridServices\ServiceManager\ServiceManager.csproj", "{E141F4EE-0000-0000-0000-000000000000}"

-EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Manager", "OpenGridServices\OpenGrid.Framework.Manager\OpenGrid.Framework.Manager.csproj", "{7924FD35-0000-0000-0000-000000000000}"

 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices\OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{21BFC8E2-0000-0000-0000-000000000000}"

@@ -25,70 +23,57 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.MySQL", "OpenGridServices\OpenGrid.Framework.Data.MySQL\OpenGrid.Framework.Data.MySQL.csproj", "{0F3C3AC1-0000-0000-0000-000000000000}"

 EndProject

 Global

-  GlobalSection(SolutionConfigurationPlatforms) = preSolution

-    Debug|Any CPU = Debug|Any CPU

-    Release|Any CPU = Release|Any CPU

-  EndGlobalSection

-  GlobalSection(ProjectDependencies) = postSolution

-    ({1E3F341A-0000-0000-0000-000000000000}).4 = ({62CDF671-0000-0000-0000-000000000000})

-    ({39BD9497-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000})

-    ({21BFC8E2-0000-0000-0000-000000000000}).6 = ({62CDF671-0000-0000-0000-000000000000})

-    ({21BFC8E2-0000-0000-0000-000000000000}).7 = ({7924FD35-0000-0000-0000-000000000000})

-    ({0A563AC1-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000})

-    ({66591469-0000-0000-0000-000000000000}).5 = ({62CDF671-0000-0000-0000-000000000000})

-    ({0F3C3AC1-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000})

-  EndGlobalSection

-  GlobalSection(ProjectConfigurationPlatforms) = postSolution

-    {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {E141F4EE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {E141F4EE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {E141F4EE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {E141F4EE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-  EndGlobalSection

-  GlobalSection(SolutionProperties) = preSolution

-    HideSolutionNode = FALSE

-  EndGlobalSection

+        GlobalSection(SolutionConfigurationPlatforms) = preSolution

+                Debug|Any CPU = Debug|Any CPU

+                Release|Any CPU = Release|Any CPU

+        EndGlobalSection

+        GlobalSection(ProjectConfigurationPlatforms) = postSolution

+                {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+        EndGlobalSection

+        GlobalSection(SolutionProperties) = preSolution

+                HideSolutionNode = FALSE

+        EndGlobalSection

 EndGlobal

diff --git a/OpenGridServices.suo b/OpenGridServices.suo
index e9a533d..460303a 100644
--- a/OpenGridServices.suo
+++ b/OpenGridServices.suo
diff --git a/OpenGridServices/OpenGridServices.AssetServer/Main.cs b/OpenGridServices/OpenGridServices.AssetServer/Main.cs
index e9b94ea..74a9bbb 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/Main.cs
+++ b/OpenGridServices/OpenGridServices.AssetServer/Main.cs
@@ -40,7 +40,6 @@ using OpenSim.Framework.Console;
 using OpenSim.Framework.Types;

 using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Utilities;

-using OpenSim.GridInterfaces.Local;             // REFACTORING IS NEEDED!!!!!!!!!!!

 using OpenSim.Servers;

 using Db4objects.Db4o;

 using Db4objects.Db4o.Query;

diff --git a/OpenGridServices/ServiceManager/ServiceManager.cs b/OpenGridServices/ServiceManager/ServiceManager.cs
deleted file mode 100644
index 8cb9c80..0000000
--- a/OpenGridServices/ServiceManager/ServiceManager.cs
+++ /dev/null
@@ -1,259 +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.Diagnostics;
-using System.Threading;
-using System.ServiceProcess;
-using System.Xml;
-using System.IO;
-using libsecondlife;
-using OpenSim.GenericConfig;
-
-public class OpenGridMasterService : System.ServiceProcess.ServiceBase {
-
-        private Thread ServiceWorkerThread;
-        private static string GridURL;          // URL of grid server
-        private static string GridSimKey;       // key sent from Grid>Sim
-        private static string SimGridKey;       // key sent Sim>Grid
-        private static string AssetURL;         // URL of asset server
-        private static string UserSendKey;      // key sent from user>sim
-        private static string UserRecvKey;      // key sent from sim>user
-
-        public OpenGridMasterService()
-        {
-                CanPauseAndContinue = false;
-                ServiceName = "OpenGridServices-master";
-        }
-
-        private void InitializeComponent()
-        {
-                this.CanPauseAndContinue = false;
-                this.CanShutdown = true;
-                this.ServiceName = "OpenGridServices-master";
-        }
-
-        protected override void OnStart(string[] args)
-        {
-                ServiceWorkerThread = new Thread(new ThreadStart(MainServiceThread));           
-                ServiceWorkerThread.Start();
-        }
-
-        protected override void OnStop()
-        {
-                ServiceWorkerThread.Abort();
-        }
-
-        private void MainServiceThread()
-        {
-         try {  
-            StreamReader reader=new  StreamReader("opengrid-master-cfg.xml");
-            
-            string configxml = reader.ReadToEnd();
-            XmlDocument doc = new XmlDocument();
-            doc.LoadXml(configxml);
-            XmlNode rootnode = doc.FirstChild;
-            if (rootnode.Name != "regions")
-            {
-                EventLog.WriteEntry("ERROR! bad XML in opengrid-master-cfg.xml - expected regions tag");

-                Console.WriteLine("Sorry, could not startup the service - please check your opengrid-master-cfg.xml file: missing regions tag");
-                (new ServiceController("OpenGridServices-master")).Stop();
-            }
-
-            for(int i=0; i<=rootnode.ChildNodes.Count; i++)
-            {
-                if(rootnode.ChildNodes.Item(i).Name != "region") {
-                        EventLog.WriteEntry("nonfatal error - unexpected tag inside regions block of opengrid-master-cfg.xml");
-                        (new ServiceController("OpenGridServices-master")).Stop();
-                }
-            }
-         } catch(Exception e) {
-            Console.WriteLine(e.ToString());
-            (new ServiceController("OpenGridServices-master")).Stop();
-         }
-        
-        }
-
-        private static string SetupGrid()
-        {

-        Console.WriteLine("Running external program (OpenGridServices.GridServer.exe) to configure the grid server");
-                try {
-                        Process p = new Process();
-
-                        p.StartInfo.Arguments = "-setuponly"; 
-                        p.StartInfo.FileName  = "OpenGridServices.GridServer.exe";
-                        p.Start();
-
-                        p.StartInfo.Arguments = "-dumpxmlconf";
-                        p.Start();
-
-                        XmlConfig GridConf = new XmlConfig("opengrid-cfg.xml");
-                        GridConf.LoadData();
-                        GridURL="http://" + GridConf.GetAttribute("ListenAddr") + ":" + GridConf.GetAttribute("ListenPort") + "/";
-
-                        StreamReader reader=new  StreamReader("opengrid-cfg.xml");
-                        string configxml = reader.ReadToEnd();
-        
-                        return configxml;
-                } catch(Exception e) {

-            Console.WriteLine("An error occurred while running the grid server, please rectify it and try again");
-                        Console.WriteLine(e.ToString());
-                        Environment.Exit(1);
-                }
-                return "";
-        }
-
-        private static string SetupUser()
-        {
-                return "<user></user>";
-        }
-
-        private static string SetupAsset()
-        {
-                return "<asset></asset>";
-        }
-
-        private static string SetupRegion()
-        {
-                string regionname;
-                ulong regionlocx;
-                ulong regionlocy;
-                string default_terrain;
-                uint terrain_multiplier;
-                uint baseport;
-
-                string listenaddr;
-                string simconfigxml;
-                LLUUID SimUUID;

-

-        Console.WriteLine("Setting up region servers");
-                Console.Write("Please specify a path to store your region data (e.g /etc/opensim/regions: ");
-                string regionpath=Console.ReadLine();
-                
-                Console.Write("How many regions would you like to configure now? ");
-                int numofregions=Convert.ToInt16(Console.ReadLine());   
-
-                Console.Write("What port should the region servers start listening at (first region is normally 9000, then 9001 the second etc, both TCP+UDP): ");
-                baseport=Convert.ToUInt16(Console.ReadLine());  
-
-                
-                listenaddr=Console.ReadLine();

-

-        Console.WriteLine("Now ready to configure regions, please answer the questions about each region in turn");
-                for(int i=0; i<=numofregions; i++) {

-            Console.WriteLine("Configuring region number " + i.ToString());
-                        
-                        Console.Write("Region name: ");
-                        regionname=Console.ReadLine();
-                        
-                        Console.Write("Region location X: ");
-                        regionlocx=(ulong)Convert.ToUInt32(Console.ReadLine());
-        
-                        Console.Write("Region location Y: ");
-                        regionlocy=(ulong)Convert.ToUInt32(Console.ReadLine());
-
-                        Console.Write("Default terrain file: ");
-                        default_terrain=Console.ReadLine();
-                        terrain_multiplier=Convert.ToUInt16(Console.ReadLine());
-
-                        SimUUID=LLUUID.Random();
-        
-                        simconfigxml="<Root><Config SimUUID=\"" + SimUUID.ToString() + "\" SimName=\"" + regionname + "\" SimLocationX=\"" + regionlocx.ToString() + "\" SimLocationY=\"" + regionlocy.ToString() + "\" Datastore=\"" + Path.Combine(regionpath,(SimUUID.ToString()+"localworld.yap")) + "\" SimListenPort=\"" + (baseport+i).ToString() + "\" SimListenAddress=\"" + listenaddr + "\" TerrainFile=\"" + default_terrain + "\" TerrainMultiplier=\"" + terrain_multiplier.ToString() + "\" GridServerURL=\"\" GridSendKey=\"\" GridRecvKey=\"\" AssetServerURL=\"\" /></Root>";
-        
-                }
-
-                return "<regions></regions>";
-        }
-
-        public static void InitSetup()
-        {
-                string choice="";
-                
-                string GridInfo;
-                string UserInfo;
-                string AssetInfo;
-                string RegionInfo;
-
-                bool grid=false;
-                bool user=false;
-                bool asset=false;
-                bool region=false;
-                while(choice!="OK")
-                {
-                        Console.Clear();

-                    Console.WriteLine("Please select the components you would like to run on this server:\n");

-

-                    Console.WriteLine("1 - [" + (grid ? "X" : " ") + "] Grid server   - this service handles co-ordinates of regions/sims on the grid");

-                    Console.WriteLine("2 - [" + (user ? "X" : " ") + "] User server   - this service handles user login, profiles, inventory and IM");

-                    Console.WriteLine("3 - [" + (asset ? "X" : " ") + "] Asset server  - this service handles storage of assets such as textures, objects, sounds, scripts");

-                    Console.WriteLine("4 - [" + (region ? "X" : " ") + "] Region server - this is the main opensim server and can run without the above services, it handles physics simulation, terrain, building and other such features");
-                
-
-                        Console.Write("Type a number to toggle a choice or type OK to accept your current choices: ");
-                        choice = Console.ReadLine();
-                        switch(choice)
-                        {
-                                case "1":
-                                        grid = (!grid);
-                                break;
-
-                                case "2":
-                                        user = (!user);
-                                break;
-
-                                case "3":
-                                        asset = (!asset);
-                                break;
-
-                                case "4":
-                                        region = (!region);
-                                break;
-                        }
-                }
-
-                if(grid) GridInfo     = SetupGrid();
-                if(user) UserInfo     = SetupUser();
-                if(asset) AssetInfo   = SetupAsset();
-                if(region) RegionInfo = SetupRegion();
-        }       
-
-        public static void Main()
-        {
-                if(!File.Exists("opengrid-master-cfg.xml")) 
-                {

-            Console.WriteLine("Could not find a config file, running initial setup");
-                        InitSetup();
-                }

-        Console.WriteLine("Starting up OGS master service");
-                try {
-                        ServiceBase.Run(new OpenGridMasterService());
-                } catch(Exception e) {

-            Console.WriteLine("An error occured while initialising OGS master service.");
-                        Console.WriteLine(e.ToString());
-                }
-        }
-}
diff --git a/OpenGridServices/ServiceManager/ServiceManager.csproj b/OpenGridServices/ServiceManager/ServiceManager.csproj
deleted file mode 100644
index 54d31b2..0000000
--- a/OpenGridServices/ServiceManager/ServiceManager.csproj
+++ /dev/null
@@ -1,88 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <ProjectType>Local</ProjectType>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{E141F4EE-0000-0000-0000-000000000000}</ProjectGuid>

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

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

-    <ApplicationIcon></ApplicationIcon>

-    <AssemblyKeyContainerName>

-    </AssemblyKeyContainerName>

-    <AssemblyName>ServiceManager</AssemblyName>

-    <DefaultClientScript>JScript</DefaultClientScript>

-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

-    <DefaultTargetSchema>IE50</DefaultTargetSchema>

-    <DelaySign>false</DelaySign>

-    <OutputType>Exe</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

-    <RootNamespace>ServiceManager</RootNamespace>

-    <StartupObject></StartupObject>

-    <FileUpgradeFlags>

-    </FileUpgradeFlags>

-  </PropertyGroup>

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

-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

-    <BaseAddress>285212672</BaseAddress>

-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>

-    <ConfigurationOverrideFile>

-    </ConfigurationOverrideFile>

-    <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile></DocumentationFile>

-    <DebugSymbols>True</DebugSymbols>

-    <FileAlignment>4096</FileAlignment>

-    <Optimize>False</Optimize>

-    <OutputPath>..\..\bin\</OutputPath>

-    <RegisterForComInterop>False</RegisterForComInterop>

-    <RemoveIntegerChecks>False</RemoveIntegerChecks>

-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

-    <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

-  </PropertyGroup>

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

-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

-    <BaseAddress>285212672</BaseAddress>

-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>

-    <ConfigurationOverrideFile>

-    </ConfigurationOverrideFile>

-    <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile></DocumentationFile>

-    <DebugSymbols>False</DebugSymbols>

-    <FileAlignment>4096</FileAlignment>

-    <Optimize>True</Optimize>

-    <OutputPath>..\..\bin\</OutputPath>

-    <RegisterForComInterop>False</RegisterForComInterop>

-    <RemoveIntegerChecks>False</RemoveIntegerChecks>

-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

-    <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="System" >

-      <HintPath>System.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="System.ServiceProcess" >

-      <HintPath>System.ServiceProcess.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="System.Xml" >

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

-      <Private>False</Private>

-    </Reference>

-  </ItemGroup>

-  <ItemGroup>

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="ServiceManager.cs">

-      <SubType>Code</SubType>

-    </Compile>

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

-  <PropertyGroup>

-    <PreBuildEvent>

-    </PreBuildEvent>

-    <PostBuildEvent>

-    </PostBuildEvent>

-  </PropertyGroup>

-</Project>

diff --git a/OpenGridServices/ServiceManager/ServiceManager.csproj.mine b/OpenGridServices/ServiceManager/ServiceManager.csproj.mine
deleted file mode 100644
index f8a4925..0000000
--- a/OpenGridServices/ServiceManager/ServiceManager.csproj.mine
+++ /dev/null
@@ -1,103 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <ProjectType>Local</ProjectType>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{E141F4EE-0000-0000-0000-000000000000}</ProjectGuid>

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

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

-    <ApplicationIcon>

-    </ApplicationIcon>

-    <AssemblyKeyContainerName>

-    </AssemblyKeyContainerName>

-    <AssemblyName>ServiceManager</AssemblyName>

-    <DefaultClientScript>JScript</DefaultClientScript>

-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

-    <DefaultTargetSchema>IE50</DefaultTargetSchema>

-    <DelaySign>false</DelaySign>

-    <OutputType>Exe</OutputType>

-    <AppDesignerFolder>

-    </AppDesignerFolder>

-    <RootNamespace>ServiceManager</RootNamespace>

-    <StartupObject>

-    </StartupObject>

-    <FileUpgradeFlags>

-    </FileUpgradeFlags>

-  </PropertyGroup>

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

-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

-    <BaseAddress>285212672</BaseAddress>

-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>

-    <ConfigurationOverrideFile>

-    </ConfigurationOverrideFile>

-    <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

-    <DebugSymbols>True</DebugSymbols>

-    <FileAlignment>4096</FileAlignment>

-    <Optimize>False</Optimize>

-    <OutputPath>..\..\bin\</OutputPath>

-    <RegisterForComInterop>False</RegisterForComInterop>

-    <RemoveIntegerChecks>False</RemoveIntegerChecks>

-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

-    <WarningLevel>4</WarningLevel>

-    <NoWarn>

-    </NoWarn>

-  </PropertyGroup>

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

-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

-    <BaseAddress>285212672</BaseAddress>

-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>

-    <ConfigurationOverrideFile>

-    </ConfigurationOverrideFile>

-    <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

-    <DebugSymbols>False</DebugSymbols>

-    <FileAlignment>4096</FileAlignment>

-    <Optimize>True</Optimize>

-    <OutputPath>..\..\bin\</OutputPath>

-    <RegisterForComInterop>False</RegisterForComInterop>

-    <RemoveIntegerChecks>False</RemoveIntegerChecks>

-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

-    <WarningLevel>4</WarningLevel>

-    <NoWarn>

-    </NoWarn>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="System">

-      <HintPath>System.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="System.ServiceProcess">

-      <HintPath>System.ServiceProcess.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="System.Xml">

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

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="libsecondlife.dll">

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

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="OpenSim.GenericConfig.Xml">

-      <HintPath>OpenSim.GenericConfig.Xml.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-  </ItemGroup>

-  <ItemGroup>

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="ServiceManager.cs">

-      <SubType>Component</SubType>

-    </Compile>

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

-  <PropertyGroup>

-    <PreBuildEvent>

-    </PreBuildEvent>

-    <PostBuildEvent>

-    </PostBuildEvent>

-  </PropertyGroup>

-</Project>
\ No newline at end of file
diff --git a/OpenGridServices/ServiceManager/ServiceManager.csproj.r858 b/OpenGridServices/ServiceManager/ServiceManager.csproj.r858
deleted file mode 100644
index 8d6a135..0000000
--- a/OpenGridServices/ServiceManager/ServiceManager.csproj.r858
+++ /dev/null
@@ -1,96 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{7C8EA758-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>ServiceManager</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>ServiceManager</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>../../bin/</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>../../bin/</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.ServiceProcess" >
-      <HintPath>System.ServiceProcess.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="OpenSim.GenericConfig.Xml" >
-      <HintPath>OpenSim.GenericConfig.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ServiceManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/OpenGridServices/ServiceManager/ServiceManager.csproj.r921 b/OpenGridServices/ServiceManager/ServiceManager.csproj.r921
deleted file mode 100644
index 0e7ff5a..0000000
--- a/OpenGridServices/ServiceManager/ServiceManager.csproj.r921
+++ /dev/null
@@ -1,100 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <ProjectType>Local</ProjectType>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{E141F4EE-0000-0000-0000-000000000000}</ProjectGuid>

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

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

-    <ApplicationIcon></ApplicationIcon>

-    <AssemblyKeyContainerName>

-    </AssemblyKeyContainerName>

-    <AssemblyName>ServiceManager</AssemblyName>

-    <DefaultClientScript>JScript</DefaultClientScript>

-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

-    <DefaultTargetSchema>IE50</DefaultTargetSchema>

-    <DelaySign>false</DelaySign>

-    <OutputType>Exe</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

-    <RootNamespace>ServiceManager</RootNamespace>

-    <StartupObject></StartupObject>

-    <FileUpgradeFlags>

-    </FileUpgradeFlags>

-  </PropertyGroup>

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

-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

-    <BaseAddress>285212672</BaseAddress>

-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>

-    <ConfigurationOverrideFile>

-    </ConfigurationOverrideFile>

-    <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile></DocumentationFile>

-    <DebugSymbols>True</DebugSymbols>

-    <FileAlignment>4096</FileAlignment>

-    <Optimize>False</Optimize>

-    <OutputPath>..\..\bin\</OutputPath>

-    <RegisterForComInterop>False</RegisterForComInterop>

-    <RemoveIntegerChecks>False</RemoveIntegerChecks>

-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

-    <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

-  </PropertyGroup>

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

-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

-    <BaseAddress>285212672</BaseAddress>

-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>

-    <ConfigurationOverrideFile>

-    </ConfigurationOverrideFile>

-    <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile></DocumentationFile>

-    <DebugSymbols>False</DebugSymbols>

-    <FileAlignment>4096</FileAlignment>

-    <Optimize>True</Optimize>

-    <OutputPath>..\..\bin\</OutputPath>

-    <RegisterForComInterop>False</RegisterForComInterop>

-    <RemoveIntegerChecks>False</RemoveIntegerChecks>

-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

-    <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="System" >

-      <HintPath>System.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="System.ServiceProcess" >

-      <HintPath>System.ServiceProcess.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="System.Xml" >

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

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="libsecondlife.dll" >

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

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="OpenSim.GenericConfig.Xml" >

-      <HintPath>OpenSim.GenericConfig.Xml.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-    <Reference Include="OpenSim.Framework.dll" >

-      <HintPath>..\..\bin\OpenSim.Framework.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

-  </ItemGroup>

-  <ItemGroup>

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="ServiceManager.cs">

-      <SubType>Code</SubType>

-    </Compile>

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

-  <PropertyGroup>

-    <PreBuildEvent>

-    </PreBuildEvent>

-    <PostBuildEvent>

-    </PostBuildEvent>

-  </PropertyGroup>

-</Project>

diff --git a/OpenGridServices/ServiceManager/ServiceManager.csproj.user b/OpenGridServices/ServiceManager/ServiceManager.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenGridServices/ServiceManager/ServiceManager.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

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

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

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

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

-</Project>

diff --git a/OpenGridServices/ServiceManager/ServiceManager.exe.build b/OpenGridServices/ServiceManager/ServiceManager.exe.build
deleted file mode 100644
index 163e086..0000000
--- a/OpenGridServices/ServiceManager/ServiceManager.exe.build
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" ?>

-<project name="ServiceManager" default="build">

-    <target name="build">

-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />

-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />

-        <copy todir="${project::get-base-directory()}/${build.dir}">

-            <fileset basedir="${project::get-base-directory()}">

-            </fileset>

-        </copy>

-        <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">

-            <resources prefix="ServiceManager" dynamicprefix="true" >

-            </resources>

-            <sources failonempty="true">

-                <include name="ServiceManager.cs" />

-            </sources>

-            <references basedir="${project::get-base-directory()}">

-                <lib>

-                    <include name="${project::get-base-directory()}" />

-                    <include name="${project::get-base-directory()}/${build.dir}" />

-                </lib>

-                <include name="System.dll" />

-                <include name="System.ServiceProcess.dll" />

-                <include name="System.Xml.dll" />

-            </references>

-        </csc>

-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />

-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>

-        <copy todir="${project::get-base-directory()}/../../bin/">

-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >

-                <include name="*.dll"/>

-                <include name="*.exe"/>

-            </fileset>

-        </copy>

-    </target>

-    <target name="clean">

-        <delete dir="${bin.dir}" failonerror="false" />

-        <delete dir="${obj.dir}" failonerror="false" />

-    </target>

-    <target name="doc" description="Creates documentation.">

-    </target>

-</project>

diff --git a/OpenSim.sln b/OpenSim.sln
index 33a7217..5b54b05 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -41,144 +41,93 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}"

 EndProject

 Global

-  GlobalSection(SolutionConfigurationPlatforms) = preSolution

-    Debug|Any CPU = Debug|Any CPU

-    Release|Any CPU = Release|Any CPU

-  EndGlobalSection

-  GlobalSection(ProjectDependencies) = postSolution

-    ({EE9E5D96-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({EE9E5D96-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({63A05FE9-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000})

-    ({683344D5-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({642A14A8-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000})

-    ({642A14A8-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({642A14A8-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({642A14A8-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000})

-    ({642A14A8-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000})

-    ({642A14A8-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000})

-    ({642A14A8-0000-0000-0000-000000000000}).11 = ({8E81D43C-0000-0000-0000-000000000000})

-    ({642A14A8-0000-0000-0000-000000000000}).12 = ({683344D5-0000-0000-0000-000000000000})

-    ({438A9556-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000})

-    ({438A9556-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({438A9556-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({438A9556-0000-0000-0000-000000000000}).8 = ({8BE16150-0000-0000-0000-000000000000})

-    ({438A9556-0000-0000-0000-000000000000}).9 = ({8BB20F0A-0000-0000-0000-000000000000})

-    ({438A9556-0000-0000-0000-000000000000}).10 = ({642A14A8-0000-0000-0000-000000000000})

-    ({438A9556-0000-0000-0000-000000000000}).11 = ({632E1BFD-0000-0000-0000-000000000000})

-    ({438A9556-0000-0000-0000-000000000000}).12 = ({E88EF749-0000-0000-0000-000000000000})

-    ({438A9556-0000-0000-0000-000000000000}).13 = ({683344D5-0000-0000-0000-000000000000})

-    ({438A9556-0000-0000-0000-000000000000}).14 = ({8E81D43C-0000-0000-0000-000000000000})

-    ({632E1BFD-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000})

-    ({632E1BFD-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({632E1BFD-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({632E1BFD-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000})

-    ({632E1BFD-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000})

-    ({632E1BFD-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000})

-    ({632E1BFD-0000-0000-0000-000000000000}).11 = ({8E81D43C-0000-0000-0000-000000000000})

-    ({E88EF749-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({8BE16150-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({8BE16150-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({4F874463-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000})

-    ({988F0AC4-0000-0000-0000-000000000000}).3 = ({8BE16150-0000-0000-0000-000000000000})

-    ({B55C0B5D-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({B55C0B5D-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({B55C0B5D-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000})

-    ({8ACA2445-0000-0000-0000-000000000000}).4 = ({8E81D43C-0000-0000-0000-000000000000})

-    ({8ACA2445-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({8BB20F0A-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({8BB20F0A-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({8BB20F0A-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000})

-    ({E1B79ECF-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({E1B79ECF-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({6B20B603-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({6B20B603-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({97A82740-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({546099CD-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({546099CD-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})

-  EndGlobalSection

-  GlobalSection(ProjectConfigurationPlatforms) = postSolution

-    {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-  EndGlobalSection

-  GlobalSection(SolutionProperties) = preSolution

-    HideSolutionNode = FALSE

-  EndGlobalSection

+        GlobalSection(SolutionConfigurationPlatforms) = preSolution

+                Debug|Any CPU = Debug|Any CPU

+                Release|Any CPU = Release|Any CPU

+        EndGlobalSection

+        GlobalSection(ProjectConfigurationPlatforms) = postSolution

+                {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+        EndGlobalSection

+        GlobalSection(SolutionProperties) = preSolution

+                HideSolutionNode = FALSE

+        EndGlobalSection

 EndGlobal

diff --git a/OpenSim.suo b/OpenSim.suo
index 8f2c6c9..4ac0030 100644
--- a/OpenSim.suo
+++ b/OpenSim.suo
diff --git a/bin/XMLRPC.dll b/bin/XMLRPC.dll
index 967b3b7..9afa15e 100644
--- a/bin/XMLRPC.dll
+++ b/bin/XMLRPC.dll
diff --git a/prebuild.xml b/prebuild.xml
index d96e405..6d64b23 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -717,30 +717,6 @@
        <Match pattern="*.cs" recurse="true"/>

      </Files>

     </Project>

-

-

-   <Project name="ServiceManager" path="OpenGridServices/ServiceManager" type="Exe">

-      <Configuration name="Debug">

-        <Options>

-          <OutputPath>../../bin/</OutputPath>

-        </Options>

-      </Configuration>

-      <Configuration name="Release">

-        <Options>

-          <OutputPath>../../bin/</OutputPath>

-        </Options>

-      </Configuration>

-

-     <ReferencePath>../../bin/</ReferencePath>

-     <Reference name="System" localCopy="false"/>

-     <Reference name="System.ServiceProcess" localCopy="false"/>

-     <Reference name="System.Xml" localCopy="false"/>

-

-     <Files>

-       <Match pattern="*.cs" recurse="true"/>

-     </Files>

-    </Project>

-

  

     <Project name="OpenGridServices.GridServer" path="OpenGridServices/OpenGridServices.GridServer" type="Exe">

       <Configuration name="Debug">