Some more code refactoring, plus a restructuring of the directories so that the Grid servers can be a separate solution to the region server.

95 files changed, 440 insertions, 0 deletions

diff --git a/OpenGrid.Config/GridConfigDb4o/AssemblyInfo.cs b/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/AssemblyInfo.cs
index b5065bc..b5065bc 100644
--- a/OpenGrid.Config/GridConfigDb4o/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/AssemblyInfo.cs
diff --git a/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs b/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
index 2d00ca6..2d00ca6 100644
--- a/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
+++ b/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
diff --git a/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj b/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj
index 00d987b..00d987b 100644
--- a/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj
+++ b/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj
diff --git a/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user b/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

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

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

+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\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/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build b/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build
index 61d3efd..61d3efd 100644
--- a/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build
+++ b/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build
diff --git a/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
index 546713e..546713e 100644
--- a/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
diff --git a/OpenGrid.Framework.Data.DB4o/DB4oManager.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
index aaa6e91..aaa6e91 100644
--- a/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
diff --git a/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs
index 7dd4c51..7dd4c51 100644
--- a/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs
diff --git a/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
index 02abc3e..02abc3e 100644
--- a/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

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

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

+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\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/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
index 144813b..144813b 100644
--- a/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
diff --git a/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs
index dc4a9a1..dc4a9a1 100644
--- a/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs
diff --git a/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs
index 0925df1..0925df1 100644
--- a/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs
diff --git a/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs
index 12c166c..12c166c 100644
--- a/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs
diff --git a/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj
index efb6a32..efb6a32 100644
--- a/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

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

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

+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\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/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build
index 61b1826..61b1826 100644
--- a/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build
diff --git a/OpenGrid.Framework.Data.MSSQL/Properties/AssemblyInfo.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/Properties/AssemblyInfo.cs
index bbe3cdf..bbe3cdf 100644
--- a/OpenGrid.Framework.Data.MSSQL/Properties/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/Properties/AssemblyInfo.cs
diff --git a/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs
index 46183b4..46183b4 100644
--- a/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs
diff --git a/OpenGrid.Framework.Data.MySQL/MySQLManager.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
index a476e97..a476e97 100644
--- a/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
diff --git a/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs
index 0741272..0741272 100644
--- a/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs
diff --git a/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
index ae3d5c5..ae3d5c5 100644
--- a/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

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

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

+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\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/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build
index a390324..a390324 100644
--- a/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build
diff --git a/OpenGrid.Framework.Data.MySQL/Properties/AssemblyInfo.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/Properties/AssemblyInfo.cs
index 0bfd1d6..0bfd1d6 100644
--- a/OpenGrid.Framework.Data.MySQL/Properties/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/Properties/AssemblyInfo.cs
diff --git a/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
index ef2ecaa..ef2ecaa 100644
--- a/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

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

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

+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\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/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build
index d9a2369..d9a2369 100644
--- a/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build
diff --git a/OpenGrid.Framework.Data.SQLite/Properties/AssemblyInfo.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/Properties/AssemblyInfo.cs
index 57c4bae..57c4bae 100644
--- a/OpenGrid.Framework.Data.SQLite/Properties/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/Properties/AssemblyInfo.cs
diff --git a/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs
index 4850f12..4850f12 100644
--- a/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs
diff --git a/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs
index 408a582..408a582 100644
--- a/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs
diff --git a/OpenGrid.Framework.Data/GridData.cs b/OpenGridServices-Source/OpenGrid.Framework.Data/GridData.cs
index 6dad37e..6dad37e 100644
--- a/OpenGrid.Framework.Data/GridData.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data/GridData.cs
diff --git a/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj b/OpenGridServices-Source/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
index 201f7ba..201f7ba 100644
--- a/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user b/OpenGridServices-Source/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

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

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

+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\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/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build b/OpenGridServices-Source/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
index a3fd771..a3fd771 100644
--- a/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
diff --git a/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs b/OpenGridServices-Source/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs
index 1446673..1446673 100644
--- a/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs
diff --git a/OpenGrid.Framework.Data/SimProfileData.cs b/OpenGridServices-Source/OpenGrid.Framework.Data/SimProfileData.cs
index c66610e..c66610e 100644
--- a/OpenGrid.Framework.Data/SimProfileData.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data/SimProfileData.cs
diff --git a/OpenGrid.Framework.Data/UserData.cs b/OpenGridServices-Source/OpenGrid.Framework.Data/UserData.cs
index 1b37957..1b37957 100644
--- a/OpenGrid.Framework.Data/UserData.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data/UserData.cs
diff --git a/OpenGrid.Framework.Data/UserProfileData.cs b/OpenGridServices-Source/OpenGrid.Framework.Data/UserProfileData.cs
index 3f42762..3f42762 100644
--- a/OpenGrid.Framework.Data/UserProfileData.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data/UserProfileData.cs
diff --git a/OpenGrid.Framework.Manager/GridManagementAgent.cs b/OpenGridServices-Source/OpenGrid.Framework.Manager/GridManagementAgent.cs
index e43ce87..e43ce87 100644
--- a/OpenGrid.Framework.Manager/GridManagementAgent.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Manager/GridManagementAgent.cs
diff --git a/OpenGrid.Framework.Manager/GridServerManager.cs b/OpenGridServices-Source/OpenGrid.Framework.Manager/GridServerManager.cs
index 7ebf66a..7ebf66a 100644
--- a/OpenGrid.Framework.Manager/GridServerManager.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Manager/GridServerManager.cs
diff --git a/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj b/OpenGridServices-Source/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj
index 3122633..3122633 100644
--- a/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj
+++ b/OpenGridServices-Source/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user b/OpenGridServices-Source/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

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

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

+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\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/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build b/OpenGridServices-Source/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build
index daee3bf..daee3bf 100644
--- a/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build
+++ b/OpenGridServices-Source/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build
diff --git a/OpenGridServices.AssetServer/AssetHttpServer.cs b/OpenGridServices-Source/OpenGridServices.AssetServer/AssetHttpServer.cs
index 8439e92..8439e92 100644
--- a/OpenGridServices.AssetServer/AssetHttpServer.cs
+++ b/OpenGridServices-Source/OpenGridServices.AssetServer/AssetHttpServer.cs
diff --git a/OpenGridServices.AssetServer/Main.cs b/OpenGridServices-Source/OpenGridServices.AssetServer/Main.cs
index 684d683..684d683 100644
--- a/OpenGridServices.AssetServer/Main.cs
+++ b/OpenGridServices-Source/OpenGridServices.AssetServer/Main.cs
diff --git a/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj b/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
index d01a52e..d01a52e 100644
--- a/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
+++ b/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
diff --git a/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user b/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

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

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

+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\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.AssetServer/OpenGridServices.AssetServer.exe.build b/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
index cd76f22..cd76f22 100644
--- a/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
+++ b/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
diff --git a/OpenGridServices.AssetServer/OpenGridServices.GridServer.csproj b/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.GridServer.csproj
index 9b8cc87..9b8cc87 100644
--- a/OpenGridServices.AssetServer/OpenGridServices.GridServer.csproj
+++ b/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.GridServer.csproj
diff --git a/OpenGridServices.AssetServer/OpenGridServices.GridServer.exe.build b/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.GridServer.exe.build
index 6bef534..6bef534 100644
--- a/OpenGridServices.AssetServer/OpenGridServices.GridServer.exe.build
+++ b/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.GridServer.exe.build
diff --git a/OpenGridServices.AssetServer/Properties/AssemblyInfo.cs b/OpenGridServices-Source/OpenGridServices.AssetServer/Properties/AssemblyInfo.cs
index 7014284..7014284 100644
--- a/OpenGridServices.AssetServer/Properties/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenGridServices.AssetServer/Properties/AssemblyInfo.cs
diff --git a/OpenGridServices.GridServer/GridManager.cs b/OpenGridServices-Source/OpenGridServices.GridServer/GridManager.cs
index 54e4bb7..54e4bb7 100644
--- a/OpenGridServices.GridServer/GridManager.cs
+++ b/OpenGridServices-Source/OpenGridServices.GridServer/GridManager.cs
diff --git a/OpenGridServices.GridServer/Main.cs b/OpenGridServices-Source/OpenGridServices.GridServer/Main.cs
index cad5fae..cad5fae 100644
--- a/OpenGridServices.GridServer/Main.cs
+++ b/OpenGridServices-Source/OpenGridServices.GridServer/Main.cs
diff --git a/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj b/OpenGridServices-Source/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
index 5f3fc6f..5f3fc6f 100644
--- a/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
+++ b/OpenGridServices-Source/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
diff --git a/OpenGridServices-Source/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user b/OpenGridServices-Source/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

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

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

+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\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.GridServer/OpenGridServices.GridServer.exe.build b/OpenGridServices-Source/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
index 9ca4d4b..9ca4d4b 100644
--- a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
+++ b/OpenGridServices-Source/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
diff --git a/OpenGridServices.GridServer/Properties/AssemblyInfo.cs b/OpenGridServices-Source/OpenGridServices.GridServer/Properties/AssemblyInfo.cs
index 8471e6b..8471e6b 100644
--- a/OpenGridServices.GridServer/Properties/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenGridServices.GridServer/Properties/AssemblyInfo.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager.mds b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager.mds
index ed7bc24..ed7bc24 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager.mds
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager.mds
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager.userprefs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager.userprefs
index f221509..f221509 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager.userprefs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager.userprefs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager.usertasks b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager.usertasks
index d887d0e..d887d0e 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager.usertasks
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager.usertasks
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/AssemblyInfo.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/AssemblyInfo.cs
index af4e275..af4e275 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/AssemblyInfo.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/BlockingQueue.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/BlockingQueue.cs
index 83685fc..83685fc 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/BlockingQueue.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/BlockingQueue.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/Connect to grid server.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/Connect to grid server.cs
index 0d509ef..0d509ef 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/Connect to grid server.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/Connect to grid server.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
index 8a80b1d..8a80b1d 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
index 6b632d6..6b632d6 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs
index 42e09e0..42e09e0 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/MainWindow.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/MainWindow.cs
index 1db38f0..1db38f0 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/MainWindow.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/MainWindow.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp
index cfdc085..cfdc085 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb
index 44e7a61..44e7a61 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/RegionBlock.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/RegionBlock.cs
index 00f7c65..00f7c65 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/RegionBlock.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/RegionBlock.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/Util.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/Util.cs
index 5bf7ff9..5bf7ff9 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/Util.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/Util.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
index da6739e..da6739e 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
index 8798dac..8798dac 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/generated.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/generated.cs
index dd4abdd..dd4abdd 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/generated.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/generated.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
index c883f08..c883f08 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
diff --git a/OpenGridServices.UserServer/Main.cs b/OpenGridServices-Source/OpenGridServices.UserServer/Main.cs
index 0eb314b..0eb314b 100644
--- a/OpenGridServices.UserServer/Main.cs
+++ b/OpenGridServices-Source/OpenGridServices.UserServer/Main.cs
diff --git a/OpenGridServices.UserServer/OGS-UserServer.csproj b/OpenGridServices-Source/OpenGridServices.UserServer/OGS-UserServer.csproj
index f4fa8b6..f4fa8b6 100644
--- a/OpenGridServices.UserServer/OGS-UserServer.csproj
+++ b/OpenGridServices-Source/OpenGridServices.UserServer/OGS-UserServer.csproj
diff --git a/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj b/OpenGridServices-Source/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
index 9f4da40..9f4da40 100644
--- a/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
+++ b/OpenGridServices-Source/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
diff --git a/OpenGridServices-Source/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user b/OpenGridServices-Source/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

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

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

+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\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.UserServer/OpenGridServices.UserServer.exe.build b/OpenGridServices-Source/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
index 548c3cc..548c3cc 100644
--- a/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
+++ b/OpenGridServices-Source/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
diff --git a/OpenGridServices.UserServer/Properties/AssemblyInfo.cs b/OpenGridServices-Source/OpenGridServices.UserServer/Properties/AssemblyInfo.cs
index 5d5ce8d..5d5ce8d 100644
--- a/OpenGridServices.UserServer/Properties/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenGridServices.UserServer/Properties/AssemblyInfo.cs
diff --git a/OpenGridServices.UserServer/UserManager.cs b/OpenGridServices-Source/OpenGridServices.UserServer/UserManager.cs
index a312445..a312445 100644
--- a/OpenGridServices.UserServer/UserManager.cs
+++ b/OpenGridServices-Source/OpenGridServices.UserServer/UserManager.cs
diff --git a/OpenUser.Config/UserConfigDb4o/AssemblyInfo.cs b/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/AssemblyInfo.cs
index 56a5535..56a5535 100644
--- a/OpenUser.Config/UserConfigDb4o/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/AssemblyInfo.cs
diff --git a/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs b/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
index a281889..a281889 100644
--- a/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
+++ b/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
diff --git a/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj b/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj
index 8c4fd39..8c4fd39 100644
--- a/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj
+++ b/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj
diff --git a/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user b/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

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

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

+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\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/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build b/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
index 8494a0b..8494a0b 100644
--- a/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
+++ b/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
diff --git a/SQL/mysql-agents.sql b/OpenGridServices-Source/SQL/mysql-agents.sql
index 8194ca9..8194ca9 100644
--- a/SQL/mysql-agents.sql
+++ b/OpenGridServices-Source/SQL/mysql-agents.sql
diff --git a/SQL/mysql-regions.sql b/OpenGridServices-Source/SQL/mysql-regions.sql
index 5392f7f..5392f7f 100644
--- a/SQL/mysql-regions.sql
+++ b/OpenGridServices-Source/SQL/mysql-regions.sql
diff --git a/SQL/mysql-users.sql b/OpenGridServices-Source/SQL/mysql-users.sql
index 5ce4d1c..5ce4d1c 100644
--- a/SQL/mysql-users.sql
+++ b/OpenGridServices-Source/SQL/mysql-users.sql
diff --git a/OpenGridServices-Source/ServiceManager/ServiceManager.cs b/OpenGridServices-Source/ServiceManager/ServiceManager.cs
new file mode 100644
index 0000000..b21a5b1
--- /dev/null
+++ b/OpenGridServices-Source/ServiceManager/ServiceManager.cs
@@ -0,0 +1,160 @@
+using System;
+using System.Diagnostics;
+using System.Threading;
+using System.ServiceProcess;
+using System.Xml;
+using System.IO;
+
+public class OpenGridMasterService : System.ServiceProcess.ServiceBase {
+
+        private Thread ServiceWorkerThread;
+
+        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");
+                Process p = new Process();
+
+                p.StartInfo.Arguments = "-setuponly"; 
+                p.StartInfo.FileName  = "OpenGridServices.GridServer.exe";
+                p.Start();
+
+                return "<gridserver />";        // we let the gridserver handle it's own setup
+        }
+
+        private static string SetupUser()
+        {
+                return "<user></user>";
+        }
+
+        private static string SetupAsset()
+        {
+                return "<asset></asset>";
+        }
+
+        private static string SetupRegion()
+        {
+                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("THIS SHOULD NEVER HAPPEN!!!!!!!!!!!!!!!!!!!!!");
+                        Console.WriteLine(e.ToString());
+                }
+        }
+}
diff --git a/OpenGridServices-Source/ServiceManager/ServiceManager.csproj b/OpenGridServices-Source/ServiceManager/ServiceManager.csproj
new file mode 100644
index 0000000..ac118c3
--- /dev/null
+++ b/OpenGridServices-Source/ServiceManager/ServiceManager.csproj
@@ -0,0 +1,95 @@
+<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>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-Source/ServiceManager/ServiceManager.csproj.user b/OpenGridServices-Source/ServiceManager/ServiceManager.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/ServiceManager/ServiceManager.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

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

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

+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\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-Source/ServiceManager/ServiceManager.exe.build b/OpenGridServices-Source/ServiceManager/ServiceManager.exe.build
new file mode 100644
index 0000000..7397f49
--- /dev/null
+++ b/OpenGridServices-Source/ServiceManager/ServiceManager.exe.build
@@ -0,0 +1,41 @@
+<?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>