66 files changed, 1841 insertions, 1189 deletions

diff --git a/Common/OpenGrid.Framework.Communications/IUserServices.cs b/Common/OpenGrid.Framework.Communications/IUserServices.cs
index 798200a..4cb66e7 100644
--- a/Common/OpenGrid.Framework.Communications/IUserServices.cs
+++ b/Common/OpenGrid.Framework.Communications/IUserServices.cs
@@ -30,15 +30,15 @@ using System.Collections.Generic;
 using System.Text;

 using libsecondlife;

 

-using OpenSim.Framework.User;

+using OpenGrid.Framework.Data;

 

 namespace OpenGrid.Framework.Communications

 {

     public interface IUserServices

     {

-        UserProfile GetUserProfile(string first_name, string last_name);

-        UserProfile GetUserProfile(string name);

-        UserProfile GetUserProfile(LLUUID avatar_id);

+        UserProfileData GetUserProfile(string first_name, string last_name);

+        UserProfileData GetUserProfile(string name);

+        UserProfileData GetUserProfile(LLUUID avatar_id);

         

     }

 }

diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
index 537151d..9a9568c 100644
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
+++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

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

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

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

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

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

-    <ApplicationIcon>

-    </ApplicationIcon>

+    <ApplicationIcon></ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenGrid.Framework.Communications</AssemblyName>

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

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder>

-    </AppDesignerFolder>

+    <AppDesignerFolder></AppDesignerFolder>

     <RootNamespace>OpenGrid.Framework.Communications</RootNamespace>

-    <StartupObject>

-    </StartupObject>

+    <StartupObject></StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

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

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

+    <DocumentationFile></DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

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

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn>

-    </NoWarn>

+    <NoWarn></NoWarn>

   </PropertyGroup>

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

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

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

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

+    <DocumentationFile></DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -61,30 +55,34 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn>

-    </NoWarn>

+    <NoWarn></NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="libsecondlife.dll">

+    <Reference Include="libsecondlife.dll" >

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

       <Private>False</Private>

     </Reference>

-    <Reference Include="System">

+    <Reference Include="System" >

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Data" />

-    <Reference Include="System.Xml">

+    <Reference Include="System.Xml" >

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

       <Private>False</Private>

     </Reference>

   </ItemGroup>

   <ItemGroup>

+    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">

+      <Name>OpenGrid.Framework.Data</Name>

+      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>

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

+                        <Private>False</Private>

+    </ProjectReference>

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

       <Name>OpenSim.Framework</Name>

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

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

-      <Private>False</Private>

+                        <Private>False</Private>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

@@ -111,4 +109,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

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

diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
index fbb627c..392220b 100644
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
+++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
@@ -23,6 +23,7 @@
                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

                 <include name="../../bin/libsecondlife.dll" />

+                <include name="../../bin/OpenGrid.Framework.Data.dll" />

                 <include name="../../bin/OpenSim.Framework.dll" />

                 <include name="System.dll" />

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

diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs b/Common/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
index 2b23131..2b23131 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
+++ b/Common/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oManager.cs b/Common/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
index 356a49c..356a49c 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
+++ b/Common/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs b/Common/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs
index 315f48d..315f48d 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs
+++ b/Common/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
index d2d6140..d2d6140 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
+++ b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.mine b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.mine
index 82d4f5f..82d4f5f 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.mine
+++ b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.mine
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r858 b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r858
index d6dd03d..d6dd03d 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r858
+++ b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r858
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r921 b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r921
index 3b783ca..3b783ca 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r921
+++ b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r921
diff --git a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user
new file mode 100644
index 0000000..5941547
--- /dev/null
+++ b/Common/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-06\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/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
index d82d751..d82d751 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
+++ b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs b/Common/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs
index dc4a9a1..dc4a9a1 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs
+++ b/Common/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs
diff --git a/OpenGridServices/OpenGrid.Framework.Data/GridData.cs b/Common/OpenGrid.Framework.Data/GridData.cs
index e9fb215..e9fb215 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/GridData.cs
+++ b/Common/OpenGrid.Framework.Data/GridData.cs
diff --git a/OpenGridServices/OpenGrid.Framework.Data/ILogData.cs b/Common/OpenGrid.Framework.Data/ILogData.cs
index 2ac0bfe..2ac0bfe 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/ILogData.cs
+++ b/Common/OpenGrid.Framework.Data/ILogData.cs
diff --git a/OpenGridServices/OpenGrid.Framework.Data/IniConfig.cs b/Common/OpenGrid.Framework.Data/IniConfig.cs
index d17afac..d17afac 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/IniConfig.cs
+++ b/Common/OpenGrid.Framework.Data/IniConfig.cs
diff --git a/OpenGridServices/OpenGrid.Framework.Data/InventoryData.cs b/Common/OpenGrid.Framework.Data/InventoryData.cs
index 12f559b..12f559b 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/InventoryData.cs
+++ b/Common/OpenGrid.Framework.Data/InventoryData.cs
diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
index 0b53b02..0b53b02 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
+++ b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.mine b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.mine
index a572204..a572204 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.mine
+++ b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.mine
diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r858 b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r858
index 3b6d24d..3b6d24d 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r858
+++ b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r858
diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r921 b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r921
index 990cd16..990cd16 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r921
+++ b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r921
diff --git a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user
new file mode 100644
index 0000000..5941547
--- /dev/null
+++ b/Common/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-06\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/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
index 7abebeb..7abebeb 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
+++ b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
diff --git a/OpenGridServices/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs b/Common/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs
index 1446673..1446673 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs
+++ b/Common/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs
diff --git a/OpenGridServices/OpenGrid.Framework.Data/SimProfileData.cs b/Common/OpenGrid.Framework.Data/SimProfileData.cs
index a3e7cb7..a3e7cb7 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/SimProfileData.cs
+++ b/Common/OpenGrid.Framework.Data/SimProfileData.cs
diff --git a/OpenGridServices/OpenGrid.Framework.Data/UserData.cs b/Common/OpenGrid.Framework.Data/UserData.cs
index c2d5a72..c2d5a72 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/UserData.cs
+++ b/Common/OpenGrid.Framework.Data/UserData.cs
diff --git a/OpenGridServices/OpenGrid.Framework.Data/UserProfileData.cs b/Common/OpenGrid.Framework.Data/UserProfileData.cs
index 82633e1..82633e1 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/UserProfileData.cs
+++ b/Common/OpenGrid.Framework.Data/UserProfileData.cs
diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj
new file mode 100644
index 0000000..232712b
--- /dev/null
+++ b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj
@@ -0,0 +1,122 @@
+<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>{DA9A7391-0000-0000-0000-000000000000}</ProjectGuid>

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

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

+    <ApplicationIcon></ApplicationIcon>

+    <AssemblyKeyContainerName>

+    </AssemblyKeyContainerName>

+    <AssemblyName>OpenGrid.Framework.UserManagement</AssemblyName>

+    <DefaultClientScript>JScript</DefaultClientScript>

+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

+    <DefaultTargetSchema>IE50</DefaultTargetSchema>

+    <DelaySign>false</DelaySign>

+    <OutputType>Library</OutputType>

+    <AppDesignerFolder></AppDesignerFolder>

+    <RootNamespace>OpenGrid.Framework.UserManagement</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="Db4objects.Db4o.dll" >

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

+      <Private>False</Private>

+    </Reference>

+    <Reference Include="libsecondlife.dll" >

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

+      <Private>False</Private>

+    </Reference>

+    <Reference Include="OpenSim.Framework" >

+      <HintPath>OpenSim.Framework.dll</HintPath>

+      <Private>False</Private>

+    </Reference>

+    <Reference Include="OpenSim.Framework.Console" >

+      <HintPath>OpenSim.Framework.Console.dll</HintPath>

+      <Private>False</Private>

+    </Reference>

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

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

+      <Private>False</Private>

+    </Reference>

+    <Reference Include="OpenSim.Servers" >

+      <HintPath>OpenSim.Servers.dll</HintPath>

+      <Private>False</Private>

+    </Reference>

+    <Reference Include="System" >

+      <HintPath>System.dll</HintPath>

+      <Private>False</Private>

+    </Reference>

+    <Reference Include="System.Data" >

+      <HintPath>System.Data.dll</HintPath>

+      <Private>False</Private>

+    </Reference>

+    <Reference Include="System.Xml" >

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

+      <Private>False</Private>

+    </Reference>

+    <Reference Include="XMLRPC" >

+      <HintPath>XMLRPC.dll</HintPath>

+      <Private>False</Private>

+    </Reference>

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">

+      <Name>OpenGrid.Framework.Data</Name>

+      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>

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

+                        <Private>False</Private>

+    </ProjectReference>

+  </ItemGroup>

+  <ItemGroup>

+    <Compile Include="UserManagerBase.cs">

+      <SubType>Code</SubType>

+    </Compile>

+  </ItemGroup>

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

+  <PropertyGroup>

+    <PreBuildEvent>

+    </PreBuildEvent>

+    <PostBuildEvent>

+    </PostBuildEvent>

+  </PropertyGroup>

+</Project>

diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj.user b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj.user
new file mode 100644
index 0000000..5941547
--- /dev/null
+++ b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.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-06\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/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build
new file mode 100644
index 0000000..a2f5d13
--- /dev/null
+++ b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build
@@ -0,0 +1,49 @@
+<?xml version="1.0" ?>

+<project name="OpenGrid.Framework.UserManagement" 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="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">

+            <resources prefix="OpenGrid.Framework.UserManagement" dynamicprefix="true" >

+            </resources>

+            <sources failonempty="true">

+                <include name="UserManagerBase.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="../../bin/Db4objects.Db4o.dll" />

+                <include name="../../bin/libsecondlife.dll" />

+                <include name="../../bin/OpenGrid.Framework.Data.dll" />

+                <include name="../../bin/OpenSim.Framework.dll" />

+                <include name="../../bin/OpenSim.Framework.Console.dll" />

+                <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />

+                <include name="../../bin/OpenSim.Servers.dll" />

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

+                <include name="System.Data.dll" />

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

+                <include name="../../bin/XMLRPC.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/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj
new file mode 100644
index 0000000..43f56a4
--- /dev/null
+++ b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj
@@ -0,0 +1,122 @@
+<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>{D1D78B8D-0000-0000-0000-000000000000}</ProjectGuid>

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

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

+    <ApplicationIcon></ApplicationIcon>

+    <AssemblyKeyContainerName>

+    </AssemblyKeyContainerName>

+    <AssemblyName>OpenGrid.Framework.UserManager</AssemblyName>

+    <DefaultClientScript>JScript</DefaultClientScript>

+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

+    <DefaultTargetSchema>IE50</DefaultTargetSchema>

+    <DelaySign>false</DelaySign>

+    <OutputType>Library</OutputType>

+    <AppDesignerFolder></AppDesignerFolder>

+    <RootNamespace>OpenGrid.Framework.UserManager</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="Db4objects.Db4o.dll" >

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

+      <Private>False</Private>

+    </Reference>

+    <Reference Include="libsecondlife.dll" >

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

+      <Private>False</Private>

+    </Reference>

+    <Reference Include="OpenSim.Framework" >

+      <HintPath>OpenSim.Framework.dll</HintPath>

+      <Private>False</Private>

+    </Reference>

+    <Reference Include="OpenSim.Framework.Console" >

+      <HintPath>OpenSim.Framework.Console.dll</HintPath>

+      <Private>False</Private>

+    </Reference>

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

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

+      <Private>False</Private>

+    </Reference>

+    <Reference Include="OpenSim.Servers" >

+      <HintPath>OpenSim.Servers.dll</HintPath>

+      <Private>False</Private>

+    </Reference>

+    <Reference Include="System" >

+      <HintPath>System.dll</HintPath>

+      <Private>False</Private>

+    </Reference>

+    <Reference Include="System.Data" >

+      <HintPath>System.Data.dll</HintPath>

+      <Private>False</Private>

+    </Reference>

+    <Reference Include="System.Xml" >

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

+      <Private>False</Private>

+    </Reference>

+    <Reference Include="XMLRPC" >

+      <HintPath>XMLRPC.dll</HintPath>

+      <Private>False</Private>

+    </Reference>

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">

+      <Name>OpenGrid.Framework.Data</Name>

+      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>

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

+                        <Private>False</Private>

+    </ProjectReference>

+  </ItemGroup>

+  <ItemGroup>

+    <Compile Include="UserManagerBase.cs">

+      <SubType>Code</SubType>

+    </Compile>

+  </ItemGroup>

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

+  <PropertyGroup>

+    <PreBuildEvent>

+    </PreBuildEvent>

+    <PostBuildEvent>

+    </PostBuildEvent>

+  </PropertyGroup>

+</Project>

diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj.user b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj.user
new file mode 100644
index 0000000..5941547
--- /dev/null
+++ b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.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-06\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/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.dll.build b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.dll.build
new file mode 100644
index 0000000..81a87f5
--- /dev/null
+++ b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.dll.build
@@ -0,0 +1,49 @@
+<?xml version="1.0" ?>

+<project name="OpenGrid.Framework.UserManager" 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="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">

+            <resources prefix="OpenGrid.Framework.UserManager" dynamicprefix="true" >

+            </resources>

+            <sources failonempty="true">

+                <include name="UserManagerBase.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="../../bin/Db4objects.Db4o.dll" />

+                <include name="../../bin/libsecondlife.dll" />

+                <include name="../../bin/OpenGrid.Framework.Data.dll" />

+                <include name="../../bin/OpenSim.Framework.dll" />

+                <include name="../../bin/OpenSim.Framework.Console.dll" />

+                <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />

+                <include name="../../bin/OpenSim.Servers.dll" />

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

+                <include name="System.Data.dll" />

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

+                <include name="../../bin/XMLRPC.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/Common/OpenGrid.Framework.UserManager/UserManagerBase.cs b/Common/OpenGrid.Framework.UserManager/UserManagerBase.cs
new file mode 100644
index 0000000..d6d50c1
--- /dev/null
+++ b/Common/OpenGrid.Framework.UserManager/UserManagerBase.cs
@@ -0,0 +1,721 @@
+/*

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

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

+*

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

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

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

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

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

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

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

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

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

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

+*

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

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

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

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

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

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

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

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

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

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

+* 

+*/

+using System;

+using System.Collections;

+using System.Collections.Generic;

+using System.Text;

+using OpenGrid.Framework.Data;

+using libsecondlife;

+using System.Reflection;

+

+using System.Xml;

+using Nwc.XmlRpc;

+using OpenSim.Framework.Sims;

+using OpenSim.Framework.Inventory;

+using OpenSim.Framework.Utilities;

+

+using System.Security.Cryptography;

+

+namespace OpenGrid.Framework.UserManagement

+{

+    public class UserManagerBase

+    {

+        public OpenSim.Framework.Interfaces.UserConfig _config;

+        Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>();

+

+        /// <summary>

+        /// Adds a new user server plugin - user servers will be requested in the order they were loaded.

+        /// </summary>

+        /// <param name="FileName">The filename to the user server plugin DLL</param>

+        public void AddPlugin(string FileName)

+        {

+            OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Attempting to load " + FileName);

+            Assembly pluginAssembly = Assembly.LoadFrom(FileName);

+

+            OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");

+            foreach (Type pluginType in pluginAssembly.GetTypes())

+            {

+                if (!pluginType.IsAbstract)

+                {

+                    Type typeInterface = pluginType.GetInterface("IUserData", true);

+

+                    if (typeInterface != null)

+                    {

+                        IUserData plug = (IUserData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));

+                        plug.Initialise();

+                        this._plugins.Add(plug.getName(), plug);

+                        OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Added IUserData Interface");

+                    }

+

+                    typeInterface = null;

+                }

+            }

+

+            pluginAssembly = null;

+        }

+

+        /// <summary>

+        /// 

+        /// </summary>

+        /// <param name="user"></param>

+        public void AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY)

+        {

+            UserProfileData user = new UserProfileData();

+            user.homeLocation = new LLVector3(128, 128, 100);

+            user.UUID = LLUUID.Random();

+            user.username = firstName;

+            user.surname = lastName;

+            user.passwordHash = pass;

+            user.passwordSalt = "";

+            user.created = Util.UnixTimeSinceEpoch();

+            user.homeLookAt = new LLVector3(100, 100, 100);

+            user.homeRegion = Util.UIntsToLong((regX * 256), (regY * 256));

+

+            foreach (KeyValuePair<string, IUserData> plugin in _plugins)

+            {

+                try

+                {

+                    plugin.Value.addNewUserProfile(user);

+                    

+                }

+                catch (Exception e)

+                {

+                    OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

+                }

+            }

+        }

+

+        /// <summary>

+        /// Loads a user profile from a database by UUID

+        /// </summary>

+        /// <param name="uuid">The target UUID</param>

+        /// <returns>A user profile</returns>

+        public UserProfileData getUserProfile(LLUUID uuid)

+        {

+            foreach (KeyValuePair<string, IUserData> plugin in _plugins)

+            {

+                try

+                {

+                    UserProfileData profile = plugin.Value.getUserByUUID(uuid);

+                    profile.currentAgent = getUserAgent(profile.UUID);

+                    return profile;

+                }

+                catch (Exception e)

+                {

+                    OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

+                }

+            }

+

+            return null;

+        }

+

+

+        /// <summary>

+        /// Loads a user profile by name

+        /// </summary>

+        /// <param name="name">The target name</param>

+        /// <returns>A user profile</returns>

+        public UserProfileData getUserProfile(string name)

+        {

+            foreach (KeyValuePair<string, IUserData> plugin in _plugins)

+            {

+                try

+                {

+                    UserProfileData profile = plugin.Value.getUserByName(name);

+                    profile.currentAgent = getUserAgent(profile.UUID);

+                    return profile;

+                }

+                catch (Exception e)

+                {

+                    OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

+                }

+            }

+

+            return null;

+        }

+

+        /// <summary>

+        /// Loads a user profile by name

+        /// </summary>

+        /// <param name="fname">First name</param>

+        /// <param name="lname">Last name</param>

+        /// <returns>A user profile</returns>

+        public UserProfileData getUserProfile(string fname, string lname)

+        {

+            foreach (KeyValuePair<string, IUserData> plugin in _plugins)

+            {

+                try

+                {

+                    UserProfileData profile = plugin.Value.getUserByName(fname,lname);

+                    try

+                    {

+                        profile.currentAgent = getUserAgent(profile.UUID);

+                    }

+                    catch (Exception e)

+                    {

+                        // Ignore

+                    }

+                    return profile;

+                }

+                catch (Exception e)

+                {

+                    OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

+                }

+            }

+

+            return null;

+        }

+

+        /// <summary>

+        /// Loads a user agent by uuid (not called directly)

+        /// </summary>

+        /// <param name="uuid">The agents UUID</param>

+        /// <returns>Agent profiles</returns>

+        public UserAgentData getUserAgent(LLUUID uuid)

+        {

+            foreach (KeyValuePair<string, IUserData> plugin in _plugins)

+            {

+                try

+                {

+                    return plugin.Value.getAgentByUUID(uuid);

+                }

+                catch (Exception e)

+                {

+                    OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

+                }

+            }

+

+            return null;

+        }

+

+        /// <summary>

+        /// Loads a user agent by name (not called directly)

+        /// </summary>

+        /// <param name="name">The agents name</param>

+        /// <returns>A user agent</returns>

+        public UserAgentData getUserAgent(string name)

+        {

+            foreach (KeyValuePair<string, IUserData> plugin in _plugins)

+            {

+                try

+                {

+                    return plugin.Value.getAgentByName(name);

+                }

+                catch (Exception e)

+                {

+                    OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

+                }

+            }

+

+            return null;

+        }

+

+        /// <summary>

+        /// Loads a user agent by name (not called directly)

+        /// </summary>

+        /// <param name="fname">The agents firstname</param>

+        /// <param name="lname">The agents lastname</param>

+        /// <returns>A user agent</returns>

+        public UserAgentData getUserAgent(string fname, string lname)

+        {

+            foreach (KeyValuePair<string, IUserData> plugin in _plugins)

+            {

+                try

+                {

+                    return plugin.Value.getAgentByName(fname,lname);

+                }

+                catch (Exception e)

+                {

+                    OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

+                }

+            }

+

+            return null;

+        }

+

+        /// <summary>

+        /// Creates a error response caused by invalid XML

+        /// </summary>

+        /// <returns>An XMLRPC response</returns>

+        private static XmlRpcResponse CreateErrorConnectingToGridResponse()

+        {

+            XmlRpcResponse response = new XmlRpcResponse();

+            Hashtable ErrorRespData = new Hashtable();

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

+            ErrorRespData["message"] = "Error connecting to grid. Could not percieve credentials from login XML.";

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

+            response.Value = ErrorRespData;

+            return response;

+        }

+

+        /// <summary>

+        /// Creates an error response caused by bad login credentials

+        /// </summary>

+        /// <returns>An XMLRPC response</returns>

+        private static XmlRpcResponse CreateLoginErrorResponse()

+        {

+            XmlRpcResponse response = new XmlRpcResponse();

+            Hashtable ErrorRespData = new Hashtable();

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

+            ErrorRespData["message"] = "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.";

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

+            response.Value = ErrorRespData;

+            return response;

+        }

+

+        /// <summary>

+        /// Creates an error response caused by being logged in already

+        /// </summary>

+        /// <returns>An XMLRPC Response</returns>

+        private static XmlRpcResponse CreateAlreadyLoggedInResponse()

+        {

+            XmlRpcResponse response = new XmlRpcResponse();

+            Hashtable PresenceErrorRespData = new Hashtable();

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

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

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

+            response.Value = PresenceErrorRespData;

+            return response;

+        }

+

+        /// <summary>

+        /// Creates an error response caused by target region being down

+        /// </summary>

+        /// <returns>An XMLRPC Response</returns>

+        private static XmlRpcResponse CreateDeadRegionResponse()

+        {

+            XmlRpcResponse response = new XmlRpcResponse();

+            Hashtable PresenceErrorRespData = new Hashtable();

+            PresenceErrorRespData["reason"] = "key";

+            PresenceErrorRespData["message"] = "The region you are attempting to log into is not responding. Please select another region and try again.";

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

+            response.Value = PresenceErrorRespData;

+            return response;

+        }

+

+        /// <summary>

+        /// Customises the login response and fills in missing values.

+        /// </summary>

+        /// <param name="response">The existing response</param>

+        /// <param name="theUser">The user profile</param>

+        public virtual void CustomiseResponse(ref Hashtable response, ref UserProfileData theUser)

+        {

+       

+        }

+

+        /// <summary>

+        /// Checks a user against it's password hash

+        /// </summary>

+        /// <param name="profile">The users profile</param>

+        /// <param name="password">The supplied password</param>

+        /// <returns>Authenticated?</returns>

+        public bool AuthenticateUser(ref UserProfileData profile, string password)

+        {

+            OpenSim.Framework.Console.MainConsole.Instance.Verbose(

+                "Authenticating " + profile.username + " " + profile.surname);

+

+            password = password.Remove(0, 3); //remove $1$

+

+            string s = Util.Md5Hash(password + ":" + profile.passwordSalt);

+

+            return profile.passwordHash.Equals(s.ToString(), StringComparison.InvariantCultureIgnoreCase);

+        }

+

+        /// <summary>

+        /// Creates and initialises a new user agent - make sure to use CommitAgent when done to submit to the DB

+        /// </summary>

+        /// <param name="profile">The users profile</param>

+        /// <param name="request">The users loginrequest</param>

+        public void CreateAgent(ref UserProfileData profile, XmlRpcRequest request)

+        {

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

+

+            UserAgentData agent = new UserAgentData();

+

+            // User connection

+            agent.agentIP = "";

+            agent.agentOnline = true;

+            agent.agentPort = 0;

+

+            // Generate sessions

+            RNGCryptoServiceProvider rand = new RNGCryptoServiceProvider();

+            byte[] randDataS = new byte[16];

+            byte[] randDataSS = new byte[16];

+            rand.GetBytes(randDataS);

+            rand.GetBytes(randDataSS);

+

+            agent.secureSessionID = new LLUUID(randDataSS, 0);

+            agent.sessionID = new LLUUID(randDataS, 0);

+

+            // Profile UUID

+            agent.UUID = profile.UUID;

+

+            // Current position (from Home)

+            agent.currentHandle = profile.homeRegion;

+            agent.currentPos = profile.homeLocation;

+

+            // If user specified additional start, use that

+            if (requestData.ContainsKey("start"))

+            {

+                string startLoc = ((string)requestData["start"]).Trim();

+                if (!(startLoc == "last" || startLoc == "home"))

+                {

+                    // Format: uri:Ahern&162&213&34

+                    try

+                    {

+                        string[] parts = startLoc.Remove(0, 4).Split('&');

+                        string region = parts[0];

+                        

+                        ////////////////////////////////////////////////////

+                        //SimProfile SimInfo = new SimProfile();

+                        //SimInfo = SimInfo.LoadFromGrid(theUser.currentAgent.currentHandle, _config.GridServerURL, _config.GridSendKey, _config.GridRecvKey);

+                    }

+                    catch (Exception e)

+                    {

+

+                    }

+                }

+            }

+

+            // What time did the user login?

+            agent.loginTime = Util.UnixTimeSinceEpoch();

+            agent.logoutTime = 0;

+

+            // Current location

+            agent.regionID = new LLUUID(); // Fill in later

+            agent.currentRegion = new LLUUID();      // Fill in later

+

+            profile.currentAgent = agent;

+        }

+

+        /// <summary>

+        /// Saves a target agent to the database

+        /// </summary>

+        /// <param name="profile">The users profile</param>

+        /// <returns>Successful?</returns>

+        public bool CommitAgent(ref UserProfileData profile)

+        {

+            // Saves the agent to database

+            return true;

+        }

+

+        /// <summary>

+        /// Main user login function

+        /// </summary>

+        /// <param name="request">The XMLRPC request</param>

+        /// <returns>The response to send</returns>

+        public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)

+        {

+            XmlRpcResponse response = new XmlRpcResponse();

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

+

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

+            bool GoodLogin = false;

+            string firstname = "";

+            string lastname = "";

+            string passwd = "";

+

+            UserProfileData TheUser;

+

+            if (GoodXML)

+            {

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

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

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

+

+                TheUser = getUserProfile(firstname, lastname);

+                if (TheUser == null)

+                    return CreateLoginErrorResponse();

+

+                GoodLogin = AuthenticateUser(ref TheUser, passwd);

+            }

+            else

+            {

+                return CreateErrorConnectingToGridResponse();

+            }

+

+            if (!GoodLogin)

+            {

+                return CreateLoginErrorResponse();

+            }

+            else

+            {

+                // If we already have a session...

+                if (TheUser.currentAgent != null && TheUser.currentAgent.agentOnline)

+                {

+                    // Reject the login

+                    return CreateAlreadyLoggedInResponse();

+                }

+                // Otherwise...

+                // Create a new agent session

+                CreateAgent(ref TheUser, request);

+

+                try

+                {

+                    Hashtable responseData = new Hashtable();

+

+                    LLUUID AgentID = TheUser.UUID;

+                    

+                    // Global Texture Section

+                    Hashtable GlobalT = new Hashtable();

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

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

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

+                    ArrayList GlobalTextures = new ArrayList();

+                    GlobalTextures.Add(GlobalT);

+

+                    // Login Flags Section

+                    Hashtable LoginFlagsHash = new Hashtable();

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

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

+                    LoginFlagsHash["gendered"] = "Y"; // Needs to be combined with below...

+                    LoginFlagsHash["ever_logged_in"] = "Y"; // Should allow male/female av selection

+                    ArrayList LoginFlags = new ArrayList();

+                    LoginFlags.Add(LoginFlagsHash);

+

+                    // UI Customisation Section

+                    Hashtable uiconfig = new Hashtable();

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

+                    ArrayList ui_config = new ArrayList();

+                    ui_config.Add(uiconfig);

+

+                    // Classified Categories Section

+                    Hashtable ClassifiedCategoriesHash = new Hashtable();

+                    ClassifiedCategoriesHash["category_name"] = "Generic";

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

+                    ArrayList ClassifiedCategories = new ArrayList();

+                    ClassifiedCategories.Add(ClassifiedCategoriesHash);

+

+                    // Inventory Library Section

+                    ArrayList AgentInventoryArray = new ArrayList();

+                    Hashtable TempHash;

+

+                    AgentInventory Library = new AgentInventory();

+                    Library.CreateRootFolder(AgentID, true);

+

+                    foreach (InventoryFolder InvFolder in Library.InventoryFolders.Values)

+                    {

+                        TempHash = new Hashtable();

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

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

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

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

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

+                        AgentInventoryArray.Add(TempHash);

+                    }

+

+                    Hashtable InventoryRootHash = new Hashtable();

+                    InventoryRootHash["folder_id"] = Library.InventoryRoot.FolderID.ToStringHyphenated();

+                    ArrayList InventoryRoot = new ArrayList();

+                    InventoryRoot.Add(InventoryRootHash);

+

+                    Hashtable InitialOutfitHash = new Hashtable();

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

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

+                    ArrayList InitialOutfit = new ArrayList();

+                    InitialOutfit.Add(InitialOutfitHash);

+

+                    // Circuit Code

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

+

+                    // Generics

+                    responseData["last_name"] = TheUser.surname;

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

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

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

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

+                    responseData["classified_categories"] = ClassifiedCategories;

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

+                    responseData["inventory-skeleton"] = AgentInventoryArray;

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

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

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

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

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

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

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

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

+                    responseData["home"] = "!!null temporary value {home}!!";   // Overwritten

+                    responseData["message"] = _config.DefaultStartupMsg;

+                    responseData["first_name"] = TheUser.username;

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

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

+                    responseData["secure_session_id"] = TheUser.currentAgent.secureSessionID.ToStringHyphenated();

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

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

+                    responseData["region_y"] = (Int32)0;    // Overwritten

+                    responseData["region_x"] = (Int32)0;    // Overwritten

+                    responseData["seed_capability"] = "";

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

+                    responseData["session_id"] = TheUser.currentAgent.sessionID.ToStringHyphenated();

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

+

+                    try

+                    {

+                        this.CustomiseResponse(ref responseData, ref TheUser);

+                    }

+                    catch (Exception e)

+                    {

+                        Console.WriteLine(e.ToString());

+                        return CreateDeadRegionResponse();

+                    }

+

+                    CommitAgent(ref TheUser);

+

+                    response.Value = responseData;

+                    //                   TheUser.SendDataToSim(SimInfo);

+                    return response;

+

+                }

+                catch (Exception E)

+                {

+                    Console.WriteLine(E.ToString());

+                }

+                //}

+            }

+            return response;

+

+        }

+

+        /// <summary>

+        /// Deletes an active agent session

+        /// </summary>

+        /// <param name="request">The request</param>

+        /// <param name="path">The path (eg /bork/narf/test)</param>

+        /// <param name="param">Parameters sent</param>

+        /// <returns>Success "OK" else error</returns>

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

+        {

+            // TODO! Important!

+

+            return "OK";

+        }

+

+        /// <summary>

+        /// Returns an error message that the user could not be found in the database

+        /// </summary>

+        /// <returns>XML string consisting of a error element containing individual error(s)</returns>

+        public string CreateUnknownUserErrorResponse()

+        {

+            System.IO.StringWriter sw = new System.IO.StringWriter();

+            XmlTextWriter xw = new XmlTextWriter(sw);

+

+            // Header

+            xw.Formatting = Formatting.Indented;

+            xw.WriteStartDocument();

+            xw.WriteDocType("error", null, null, null);

+            xw.WriteComment("An error occured");

+            xw.WriteStartElement("error");

+

+            // User

+            xw.WriteElementString("unknownuser", "Unable to find a user with that name");

+

+            // Footer

+            xw.WriteEndElement();

+            xw.Flush();

+            xw.Close();

+

+            return sw.ToString();

+        }

+

+        /// <summary>

+        /// Converts a user profile to an XML element which can be returned

+        /// </summary>

+        /// <param name="profile">The user profile</param>

+        /// <returns>A string containing an XML Document of the user profile</returns>

+        public string ProfileToXml(UserProfileData profile)

+        {

+            System.IO.StringWriter sw = new System.IO.StringWriter();

+            XmlTextWriter xw = new XmlTextWriter(sw);

+

+            // Header

+            xw.Formatting = Formatting.Indented;

+            xw.WriteStartDocument();

+            xw.WriteDocType("userprofile", null, null, null);

+            xw.WriteComment("Found user profiles matching the request");

+            xw.WriteStartElement("users");

+

+            // User

+            xw.WriteStartElement("user");

+            // Account information

+            xw.WriteAttributeString("firstname", profile.username);

+            xw.WriteAttributeString("lastname", profile.surname);

+            xw.WriteAttributeString("uuid", profile.UUID.ToStringHyphenated());

+            // Server Information

+            xw.WriteAttributeString("server_inventory", profile.userInventoryURI);

+            xw.WriteAttributeString("server_asset", profile.userAssetURI);

+            // Profile Information

+            xw.WriteAttributeString("profile_about", profile.profileAboutText);

+            xw.WriteAttributeString("profile_firstlife_about", profile.profileFirstText);

+            xw.WriteAttributeString("profile_firstlife_image", profile.profileFirstImage.ToStringHyphenated());

+            xw.WriteAttributeString("profile_can_do", profile.profileCanDoMask.ToString());

+            xw.WriteAttributeString("profile_want_do", profile.profileWantDoMask.ToString());

+            xw.WriteAttributeString("profile_image", profile.profileImage.ToStringHyphenated());

+            xw.WriteAttributeString("profile_created",profile.created.ToString());

+            xw.WriteAttributeString("profile_lastlogin",profile.lastLogin.ToString());

+            // Home region information

+            xw.WriteAttributeString("home_coordinates", profile.homeLocation.ToString());

+            xw.WriteAttributeString("home_region", profile.homeRegion.ToString());

+            xw.WriteAttributeString("home_look", profile.homeLookAt.ToString());

+

+            xw.WriteEndElement();

+

+            // Footer

+            xw.WriteEndElement();

+            xw.Flush();

+            xw.Close();

+

+            return sw.ToString();

+        }

+

+        public string RestGetUserMethodName(string request, string path, string param)

+        {

+            UserProfileData userProfile = getUserProfile(param.Trim());

+

+            if (userProfile == null)

+            {

+                return CreateUnknownUserErrorResponse();

+            }

+

+            return ProfileToXml(userProfile);

+        }

+

+        public string RestGetUserMethodUUID(string request, string path, string param)

+        {

+            UserProfileData userProfile = getUserProfile(new LLUUID(param));

+

+            if (userProfile == null)

+            {

+                return CreateUnknownUserErrorResponse();

+            }

+

+            return ProfileToXml(userProfile);

+        }

+

+    }

+}

diff --git a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj b/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj
index ad5480b..df68722 100644
--- a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj
+++ b/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj
@@ -50,7 +50,7 @@
     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

-    <OutputPath>bin\</OutputPath>

+    <OutputPath>..\..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

diff --git a/OpenGridServices.build b/OpenGridServices.build
index d461ac8..7cfe21e 100644
--- a/OpenGridServices.build
+++ b/OpenGridServices.build
@@ -47,12 +47,13 @@
         <delete dir="${bin.dir}" failonerror="false" />

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

         <nant buildfile="OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="clean" />

-        <nant buildfile="OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="clean" />

-        <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="clean" />

+        <nant buildfile="Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="clean" />

+        <nant buildfile="Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="clean" />

         <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="clean" />

         <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="clean" />

         <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="clean" />

         <nant buildfile="OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build" target="clean" />

+        <nant buildfile="Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build" target="clean" />

         <nant buildfile="OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="clean" />

         <nant buildfile="OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" />

         <nant buildfile="OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" />

@@ -60,14 +61,15 @@
     </target>

 

     <target name="build" depends="init" description="">

-        <nant buildfile="OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="build" />

+        <nant buildfile="Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="build" />

         <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="build" />

-        <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="build" />

+        <nant buildfile="Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="build" />

         <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="build" />

         <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="build" />

         <nant buildfile="OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build" target="build" />

         <nant buildfile="OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" />

         <nant buildfile="OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="build" />

+        <nant buildfile="Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build" target="build" />

         <nant buildfile="OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" />

         <nant buildfile="OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="build" />

         <nant buildfile="OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="build" />

@@ -82,12 +84,13 @@
     <target name="doc" depends="build-release">

         <echo message="Generating all documentation from all builds" />

         <nant buildfile="OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="doc" />

-        <nant buildfile="OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="doc" />

-        <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="doc" />

+        <nant buildfile="Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="doc" />

+        <nant buildfile="Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="doc" />

         <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="doc" />

         <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="doc" />

         <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="doc" />

         <nant buildfile="OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build" target="doc" />

+        <nant buildfile="Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build" target="doc" />

         <nant buildfile="OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="doc" />

         <nant buildfile="OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" />

         <nant buildfile="OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" />

diff --git a/OpenGridServices.sln b/OpenGridServices.sln
index 523be71..4772960 100644
--- a/OpenGridServices.sln
+++ b/OpenGridServices.sln
@@ -1,10 +1,10 @@
 Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual Studio 2005

+# Visual C# Express 2005

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Config.GridConfigDb4o", "OpenGridServices\OpenGrid.Config\GridConfigDb4o\OpenGrid.Config.GridConfigDb4o.csproj", "{B0027747-0000-0000-0000-000000000000}"

 EndProject

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

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data", "Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj", "{62CDF671-0000-0000-0000-000000000000}"

 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}"

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

 EndProject

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

 EndProject

@@ -14,6 +14,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.SQL
 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}") = "OpenGrid.Framework.UserManagement", "Common\OpenGrid.Framework.UserManager\OpenGrid.Framework.UserManagement.csproj", "{DA9A7391-0000-0000-0000-000000000000}"

+EndProject

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

 EndProject

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

@@ -23,66 +25,61 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenUser.Config.UserConfigDb4o", "OpenGridServices\OpenUser.Config\UserConfigDb4o\OpenUser.Config.UserConfigDb4o.csproj", "{7E494328-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

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

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

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

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

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

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

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

-  EndGlobalSection

-  GlobalSection(ProjectConfigurationPlatforms) = postSolution

-    {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

-    {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

-    {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

-    {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

-    {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

-    {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

-    {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

-    {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

-    {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

-    {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

-    {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

-  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

+                {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

+                {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

+                {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

+                {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

+                {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

+                {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

+                {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

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

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

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

+                {DA9A7391-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

+                {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

+                {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

+                {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

+        EndGlobalSection

+        GlobalSection(SolutionProperties) = preSolution

+                HideSolutionNode = FALSE

+        EndGlobalSection

 EndGlobal

diff --git a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj
index fa18c28..64bb78e 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj
@@ -76,7 +76,7 @@
     </Reference>

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">

+    <ProjectReference Include="..\..\Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">

       <Name>OpenGrid.Framework.Data</Name>

       <Project>{62CDF671-0000-0000-0000-000000000000}</Project>

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

diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
index cc3aacb..c1fc2da 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
@@ -80,7 +80,7 @@
     </Reference>

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">

+    <ProjectReference Include="..\..\Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">

       <Name>OpenGrid.Framework.Data</Name>

       <Project>{62CDF671-0000-0000-0000-000000000000}</Project>

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

diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
index 63d0bd9..da42e05 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
@@ -80,7 +80,7 @@
     </Reference>

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">

+    <ProjectReference Include="..\..\Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">

       <Name>OpenGrid.Framework.Data</Name>

       <Project>{62CDF671-0000-0000-0000-000000000000}</Project>

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

diff --git a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
index 55a0e02..291f997 100644
--- a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
+++ b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
@@ -100,7 +100,7 @@
     </Reference>

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">

+    <ProjectReference Include="..\..\Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">

       <Name>OpenGrid.Framework.Data</Name>

       <Project>{62CDF671-0000-0000-0000-000000000000}</Project>

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

diff --git a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
index b3d318c..ad0080a 100644
--- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
+++ b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
@@ -66,6 +66,10 @@
       <HintPath>..\..\bin\libsecondlife.dll</HintPath>

       <Private>False</Private>

     </Reference>

+    <Reference Include="OpenGrid.Framework.UserManager" >

+      <HintPath>OpenGrid.Framework.UserManager.dll</HintPath>

+      <Private>False</Private>

+    </Reference>

     <Reference Include="OpenSim.Framework" >

       <HintPath>OpenSim.Framework.dll</HintPath>

       <Private>False</Private>

@@ -100,7 +104,7 @@
     </Reference>

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">

+    <ProjectReference Include="..\..\Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">

       <Name>OpenGrid.Framework.Data</Name>

       <Project>{62CDF671-0000-0000-0000-000000000000}</Project>

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

diff --git a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
index 68cbef7..a24003f 100644
--- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
+++ b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
@@ -23,6 +23,7 @@
                 <include name="../../bin/Db4objects.Db4o.dll" />

                 <include name="../../bin/libsecondlife.dll" />

                 <include name="../../bin/OpenGrid.Framework.Data.dll" />

+                <include name="../../bin/OpenGrid.Framework.UserManager.dll" />

                 <include name="../../bin/OpenSim.Framework.dll" />

                 <include name="../../bin/OpenSim.Framework.Console.dll" />

                 <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />

diff --git a/OpenGridServices/OpenGridServices.UserServer/UserManager.cs b/OpenGridServices/OpenGridServices.UserServer/UserManager.cs
index f512b15..6f5f054 100644
--- a/OpenGridServices/OpenGridServices.UserServer/UserManager.cs
+++ b/OpenGridServices/OpenGridServices.UserServer/UserManager.cs
@@ -38,284 +38,16 @@ using Nwc.XmlRpc;
 using OpenSim.Framework.Sims;

 using OpenSim.Framework.Inventory;

 using OpenSim.Framework.Utilities;

+using OpenGrid.Framework.UserManagement;

 

 using System.Security.Cryptography;

 

 namespace OpenGridServices.UserServer

 {

-    public class UserManager

+    public class UserManager : UserManagerBase

     {

-        public OpenSim.Framework.Interfaces.UserConfig _config;

-        Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>();

-

-        /// <summary>

-        /// Adds a new user server plugin - user servers will be requested in the order they were loaded.

-        /// </summary>

-        /// <param name="FileName">The filename to the user server plugin DLL</param>

-        public void AddPlugin(string FileName)

-        {

-            OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Attempting to load " + FileName);

-            Assembly pluginAssembly = Assembly.LoadFrom(FileName);

-

-            OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");

-            foreach (Type pluginType in pluginAssembly.GetTypes())

-            {

-                if (!pluginType.IsAbstract)

-                {

-                    Type typeInterface = pluginType.GetInterface("IUserData", true);

-

-                    if (typeInterface != null)

-                    {

-                        IUserData plug = (IUserData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));

-                        plug.Initialise();

-                        this._plugins.Add(plug.getName(), plug);

-                        OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Added IUserData Interface");

-                    }

-

-                    typeInterface = null;

-                }

-            }

-

-            pluginAssembly = null;

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <param name="user"></param>

-        public void AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY)

-        {

-            UserProfileData user = new UserProfileData();

-            user.homeLocation = new LLVector3(128, 128, 100);

-            user.UUID = LLUUID.Random();

-            user.username = firstName;

-            user.surname = lastName;

-            user.passwordHash = pass;

-            user.passwordSalt = "";

-            user.created = Util.UnixTimeSinceEpoch();

-            user.homeLookAt = new LLVector3(100, 100, 100);

-            user.homeRegion = Util.UIntsToLong((regX * 256), (regY * 256));

-

-            foreach (KeyValuePair<string, IUserData> plugin in _plugins)

-            {

-                try

-                {

-                    plugin.Value.addNewUserProfile(user);

-                    

-                }

-                catch (Exception e)

-                {

-                    OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

-                }

-            }

-        }

-

-        /// <summary>

-        /// Loads a user profile from a database by UUID

-        /// </summary>

-        /// <param name="uuid">The target UUID</param>

-        /// <returns>A user profile</returns>

-        public UserProfileData getUserProfile(LLUUID uuid)

-        {

-            foreach (KeyValuePair<string, IUserData> plugin in _plugins)

-            {

-                try

-                {

-                    UserProfileData profile = plugin.Value.getUserByUUID(uuid);

-                    profile.currentAgent = getUserAgent(profile.UUID);

-                    return profile;

-                }

-                catch (Exception e)

-                {

-                    OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

-                }

-            }

-

-            return null;

-        }

-

-

-        /// <summary>

-        /// Loads a user profile by name

-        /// </summary>

-        /// <param name="name">The target name</param>

-        /// <returns>A user profile</returns>

-        public UserProfileData getUserProfile(string name)

-        {

-            foreach (KeyValuePair<string, IUserData> plugin in _plugins)

-            {

-                try

-                {

-                    UserProfileData profile = plugin.Value.getUserByName(name);

-                    profile.currentAgent = getUserAgent(profile.UUID);

-                    return profile;

-                }

-                catch (Exception e)

-                {

-                    OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

-                }

-            }

-

-            return null;

-        }

-

-        /// <summary>

-        /// Loads a user profile by name

-        /// </summary>

-        /// <param name="fname">First name</param>

-        /// <param name="lname">Last name</param>

-        /// <returns>A user profile</returns>

-        public UserProfileData getUserProfile(string fname, string lname)

-        {

-            foreach (KeyValuePair<string, IUserData> plugin in _plugins)

-            {

-                try

-                {

-                    UserProfileData profile = plugin.Value.getUserByName(fname,lname);

-                    try

-                    {

-                        profile.currentAgent = getUserAgent(profile.UUID);

-                    }

-                    catch (Exception e)

-                    {

-                        // Ignore

-                    }

-                    return profile;

-                }

-                catch (Exception e)

-                {

-                    OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

-                }

-            }

-

-            return null;

-        }

-

-        /// <summary>

-        /// Loads a user agent by uuid (not called directly)

-        /// </summary>

-        /// <param name="uuid">The agents UUID</param>

-        /// <returns>Agent profiles</returns>

-        public UserAgentData getUserAgent(LLUUID uuid)

-        {

-            foreach (KeyValuePair<string, IUserData> plugin in _plugins)

-            {

-                try

-                {

-                    return plugin.Value.getAgentByUUID(uuid);

-                }

-                catch (Exception e)

-                {

-                    OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

-                }

-            }

-

-            return null;

-        }

-

-        /// <summary>

-        /// Loads a user agent by name (not called directly)

-        /// </summary>

-        /// <param name="name">The agents name</param>

-        /// <returns>A user agent</returns>

-        public UserAgentData getUserAgent(string name)

+        public UserManager()

         {

-            foreach (KeyValuePair<string, IUserData> plugin in _plugins)

-            {

-                try

-                {

-                    return plugin.Value.getAgentByName(name);

-                }

-                catch (Exception e)

-                {

-                    OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

-                }

-            }

-

-            return null;

-        }

-

-        /// <summary>

-        /// Loads a user agent by name (not called directly)

-        /// </summary>

-        /// <param name="fname">The agents firstname</param>

-        /// <param name="lname">The agents lastname</param>

-        /// <returns>A user agent</returns>

-        public UserAgentData getUserAgent(string fname, string lname)

-        {

-            foreach (KeyValuePair<string, IUserData> plugin in _plugins)

-            {

-                try

-                {

-                    return plugin.Value.getAgentByName(fname,lname);

-                }

-                catch (Exception e)

-                {

-                    OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

-                }

-            }

-

-            return null;

-        }

-

-        /// <summary>

-        /// Creates a error response caused by invalid XML

-        /// </summary>

-        /// <returns>An XMLRPC response</returns>

-        private static XmlRpcResponse CreateErrorConnectingToGridResponse()

-        {

-            XmlRpcResponse response = new XmlRpcResponse();

-            Hashtable ErrorRespData = new Hashtable();

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

-            ErrorRespData["message"] = "Error connecting to grid. Could not percieve credentials from login XML.";

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

-            response.Value = ErrorRespData;

-            return response;

-        }

-

-        /// <summary>

-        /// Creates an error response caused by bad login credentials

-        /// </summary>

-        /// <returns>An XMLRPC response</returns>

-        private static XmlRpcResponse CreateLoginErrorResponse()

-        {

-            XmlRpcResponse response = new XmlRpcResponse();

-            Hashtable ErrorRespData = new Hashtable();

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

-            ErrorRespData["message"] = "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.";

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

-            response.Value = ErrorRespData;

-            return response;

-        }

-

-        /// <summary>

-        /// Creates an error response caused by being logged in already

-        /// </summary>

-        /// <returns>An XMLRPC Response</returns>

-        private static XmlRpcResponse CreateAlreadyLoggedInResponse()

-        {

-            XmlRpcResponse response = new XmlRpcResponse();

-            Hashtable PresenceErrorRespData = new Hashtable();

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

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

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

-            response.Value = PresenceErrorRespData;

-            return response;

-        }

-

-        /// <summary>

-        /// Creates an error response caused by target region being down

-        /// </summary>

-        /// <returns>An XMLRPC Response</returns>

-        private static XmlRpcResponse CreateDeadRegionResponse()

-        {

-            XmlRpcResponse response = new XmlRpcResponse();

-            Hashtable PresenceErrorRespData = new Hashtable();

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

-            PresenceErrorRespData["message"] = "The region you are attempting to log into is not responding. Please select another region and try again.";

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

-            response.Value = PresenceErrorRespData;

-            return response;

         }

 

         /// <summary>

@@ -323,7 +55,7 @@ namespace OpenGridServices.UserServer
         /// </summary>

         /// <param name="response">The existing response</param>

         /// <param name="theUser">The user profile</param>

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

+        public override void CustomiseResponse(ref Hashtable response, ref UserProfileData theUser)

         {

             // Load information from the gridserver

             SimProfile SimInfo = new SimProfile();

@@ -331,7 +63,7 @@ namespace OpenGridServices.UserServer
 

             // Customise the response

             // Home Location

-            response["home"] = "{'region_handle':[r" + (SimInfo.RegionLocX * 256).ToString() + ",r" + (SimInfo.RegionLocY * 256).ToString() + "], " + 

+            response["home"] = "{'region_handle':[r" + (SimInfo.RegionLocX * 256).ToString() + ",r" + (SimInfo.RegionLocY * 256).ToString() + "], " +

                 "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +

                 "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";

 

@@ -366,395 +98,5 @@ namespace OpenGridServices.UserServer
             XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);

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

         }

-

-        /// <summary>

-        /// Checks a user against it's password hash

-        /// </summary>

-        /// <param name="profile">The users profile</param>

-        /// <param name="password">The supplied password</param>

-        /// <returns>Authenticated?</returns>

-        public bool AuthenticateUser(ref UserProfileData profile, string password)

-        {

-            OpenSim.Framework.Console.MainConsole.Instance.Verbose(

-                "Authenticating " + profile.username + " " + profile.surname);

-

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

-

-            string s = Util.Md5Hash(password + ":" + profile.passwordSalt);

-

-            return profile.passwordHash.Equals(s.ToString(), StringComparison.InvariantCultureIgnoreCase);

-        }

-

-        /// <summary>

-        /// Creates and initialises a new user agent - make sure to use CommitAgent when done to submit to the DB

-        /// </summary>

-        /// <param name="profile">The users profile</param>

-        /// <param name="request">The users loginrequest</param>

-        public void CreateAgent(ref UserProfileData profile, XmlRpcRequest request)

-        {

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

-

-            UserAgentData agent = new UserAgentData();

-

-            // User connection

-            agent.agentIP = "";

-            agent.agentOnline = true;

-            agent.agentPort = 0;

-

-            // Generate sessions

-            RNGCryptoServiceProvider rand = new RNGCryptoServiceProvider();

-            byte[] randDataS = new byte[16];

-            byte[] randDataSS = new byte[16];

-            rand.GetBytes(randDataS);

-            rand.GetBytes(randDataSS);

-

-            agent.secureSessionID = new LLUUID(randDataSS, 0);

-            agent.sessionID = new LLUUID(randDataS, 0);

-

-            // Profile UUID

-            agent.UUID = profile.UUID;

-

-            // Current position (from Home)

-            agent.currentHandle = profile.homeRegion;

-            agent.currentPos = profile.homeLocation;

-

-            // If user specified additional start, use that

-            if (requestData.ContainsKey("start"))

-            {

-                string startLoc = ((string)requestData["start"]).Trim();

-                if (!(startLoc == "last" || startLoc == "home"))

-                {

-                    // Format: uri:Ahern&162&213&34

-                    try

-                    {

-                        string[] parts = startLoc.Remove(0, 4).Split('&');

-                        string region = parts[0];

-                        

-                        ////////////////////////////////////////////////////

-                        //SimProfile SimInfo = new SimProfile();

-                        //SimInfo = SimInfo.LoadFromGrid(theUser.currentAgent.currentHandle, _config.GridServerURL, _config.GridSendKey, _config.GridRecvKey);

-                    }

-                    catch (Exception e)

-                    {

-

-                    }

-                }

-            }

-

-            // What time did the user login?

-            agent.loginTime = Util.UnixTimeSinceEpoch();

-            agent.logoutTime = 0;

-

-            // Current location

-            agent.regionID = new LLUUID(); // Fill in later

-            agent.currentRegion = new LLUUID();      // Fill in later

-

-            profile.currentAgent = agent;

-        }

-

-        /// <summary>

-        /// Saves a target agent to the database

-        /// </summary>

-        /// <param name="profile">The users profile</param>

-        /// <returns>Successful?</returns>

-        public bool CommitAgent(ref UserProfileData profile)

-        {

-            // Saves the agent to database

-            return true;

-        }

-

-        /// <summary>

-        /// Main user login function

-        /// </summary>

-        /// <param name="request">The XMLRPC request</param>

-        /// <returns>The response to send</returns>

-        public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)

-        {

-            XmlRpcResponse response = new XmlRpcResponse();

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

-

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

-            bool GoodLogin = false;

-            string firstname = "";

-            string lastname = "";

-            string passwd = "";

-

-            UserProfileData TheUser;

-

-            if (GoodXML)

-            {

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

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

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

-

-                TheUser = getUserProfile(firstname, lastname);

-                if (TheUser == null)

-                    return CreateLoginErrorResponse();

-

-                GoodLogin = AuthenticateUser(ref TheUser, passwd);

-            }

-            else

-            {

-                return CreateErrorConnectingToGridResponse();

-            }

-

-            if (!GoodLogin)

-            {

-                return CreateLoginErrorResponse();

-            }

-            else

-            {

-                // If we already have a session...

-                if (TheUser.currentAgent != null && TheUser.currentAgent.agentOnline)

-                {

-                    // Reject the login

-                    return CreateAlreadyLoggedInResponse();

-                }

-                // Otherwise...

-                // Create a new agent session

-                CreateAgent(ref TheUser, request);

-

-                try

-                {

-                    Hashtable responseData = new Hashtable();

-

-                    LLUUID AgentID = TheUser.UUID;

-                    

-                    // Global Texture Section

-                    Hashtable GlobalT = new Hashtable();

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

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

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

-                    ArrayList GlobalTextures = new ArrayList();

-                    GlobalTextures.Add(GlobalT);

-

-                    // Login Flags Section

-                    Hashtable LoginFlagsHash = new Hashtable();

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

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

-                    LoginFlagsHash["gendered"] = "Y"; // Needs to be combined with below...

-                    LoginFlagsHash["ever_logged_in"] = "Y"; // Should allow male/female av selection

-                    ArrayList LoginFlags = new ArrayList();

-                    LoginFlags.Add(LoginFlagsHash);

-

-                    // UI Customisation Section

-                    Hashtable uiconfig = new Hashtable();

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

-                    ArrayList ui_config = new ArrayList();

-                    ui_config.Add(uiconfig);

-

-                    // Classified Categories Section

-                    Hashtable ClassifiedCategoriesHash = new Hashtable();

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

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

-                    ArrayList ClassifiedCategories = new ArrayList();

-                    ClassifiedCategories.Add(ClassifiedCategoriesHash);

-

-                    // Inventory Library Section

-                    ArrayList AgentInventoryArray = new ArrayList();

-                    Hashtable TempHash;

-

-                    AgentInventory Library = new AgentInventory();

-                    Library.CreateRootFolder(AgentID, true);

-

-                    foreach (InventoryFolder InvFolder in Library.InventoryFolders.Values)

-                    {

-                        TempHash = new Hashtable();

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

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

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

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

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

-                        AgentInventoryArray.Add(TempHash);

-                    }

-

-                    Hashtable InventoryRootHash = new Hashtable();

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

-                    ArrayList InventoryRoot = new ArrayList();

-                    InventoryRoot.Add(InventoryRootHash);

-

-                    Hashtable InitialOutfitHash = new Hashtable();

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

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

-                    ArrayList InitialOutfit = new ArrayList();

-                    InitialOutfit.Add(InitialOutfitHash);

-

-                    // Circuit Code

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

-

-                    // Generics

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

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

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

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

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

-                    responseData["classified_categories"] = ClassifiedCategories;

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

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

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

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

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

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

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

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

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

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

-                    responseData["home"] = "!!null temporary value {home}!!";   // Overwritten

-                    responseData["message"] = _config.DefaultStartupMsg;

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

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

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

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

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

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

-                    responseData["region_y"] = (Int32)0;    // Overwritten

-                    responseData["region_x"] = (Int32)0;    // Overwritten

-                    responseData["seed_capability"] = "";

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

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

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

-

-                    try

-                    {

-                        this.CustomiseResponse(ref responseData, ref TheUser);

-                    }

-                    catch (Exception e)

-                    {

-                        Console.WriteLine(e.ToString());

-                        return CreateDeadRegionResponse();

-                    }

-

-                    CommitAgent(ref TheUser);

-

-                    response.Value = responseData;

-                    //                   TheUser.SendDataToSim(SimInfo);

-                    return response;

-

-                }

-                catch (Exception E)

-                {

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

-                }

-                //}

-            }

-            return response;

-

-        }

-

-        /// <summary>

-        /// Deletes an active agent session

-        /// </summary>

-        /// <param name="request">The request</param>

-        /// <param name="path">The path (eg /bork/narf/test)</param>

-        /// <param name="param">Parameters sent</param>

-        /// <returns>Success "OK" else error</returns>

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

-        {

-            // TODO! Important!

-

-            return "OK";

-        }

-

-        /// <summary>

-        /// Returns an error message that the user could not be found in the database

-        /// </summary>

-        /// <returns>XML string consisting of a error element containing individual error(s)</returns>

-        public string CreateUnknownUserErrorResponse()

-        {

-            System.IO.StringWriter sw = new System.IO.StringWriter();

-            XmlTextWriter xw = new XmlTextWriter(sw);

-

-            // Header

-            xw.Formatting = Formatting.Indented;

-            xw.WriteStartDocument();

-            xw.WriteDocType("error", null, null, null);

-            xw.WriteComment("An error occured");

-            xw.WriteStartElement("error");

-

-            // User

-            xw.WriteElementString("unknownuser", "Unable to find a user with that name");

-

-            // Footer

-            xw.WriteEndElement();

-            xw.Flush();

-            xw.Close();

-

-            return sw.ToString();

-        }

-

-        /// <summary>

-        /// Converts a user profile to an XML element which can be returned

-        /// </summary>

-        /// <param name="profile">The user profile</param>

-        /// <returns>A string containing an XML Document of the user profile</returns>

-        public string ProfileToXml(UserProfileData profile)

-        {

-            System.IO.StringWriter sw = new System.IO.StringWriter();

-            XmlTextWriter xw = new XmlTextWriter(sw);

-

-            // Header

-            xw.Formatting = Formatting.Indented;

-            xw.WriteStartDocument();

-            xw.WriteDocType("userprofile", null, null, null);

-            xw.WriteComment("Found user profiles matching the request");

-            xw.WriteStartElement("users");

-

-            // User

-            xw.WriteStartElement("user");

-            // Account information

-            xw.WriteAttributeString("firstname", profile.username);

-            xw.WriteAttributeString("lastname", profile.surname);

-            xw.WriteAttributeString("uuid", profile.UUID.ToStringHyphenated());

-            // Server Information

-            xw.WriteAttributeString("server_inventory", profile.userInventoryURI);

-            xw.WriteAttributeString("server_asset", profile.userAssetURI);

-            // Profile Information

-            xw.WriteAttributeString("profile_about", profile.profileAboutText);

-            xw.WriteAttributeString("profile_firstlife_about", profile.profileFirstText);

-            xw.WriteAttributeString("profile_firstlife_image", profile.profileFirstImage.ToStringHyphenated());

-            xw.WriteAttributeString("profile_can_do", profile.profileCanDoMask.ToString());

-            xw.WriteAttributeString("profile_want_do", profile.profileWantDoMask.ToString());

-            xw.WriteAttributeString("profile_image", profile.profileImage.ToStringHyphenated());

-            xw.WriteAttributeString("profile_created",profile.created.ToString());

-            xw.WriteAttributeString("profile_lastlogin",profile.lastLogin.ToString());

-            // Home region information

-            xw.WriteAttributeString("home_coordinates", profile.homeLocation.ToString());

-            xw.WriteAttributeString("home_region", profile.homeRegion.ToString());

-            xw.WriteAttributeString("home_look", profile.homeLookAt.ToString());

-

-            xw.WriteEndElement();

-

-            // Footer

-            xw.WriteEndElement();

-            xw.Flush();

-            xw.Close();

-

-            return sw.ToString();

-        }

-

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

-        {

-            UserProfileData userProfile = getUserProfile(param.Trim());

-

-            if (userProfile == null)

-            {

-                return CreateUnknownUserErrorResponse();

-            }

-

-            return ProfileToXml(userProfile);

-        }

-

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

-        {

-            UserProfileData userProfile = getUserProfile(new LLUUID(param));

-

-            if (userProfile == null)

-            {

-                return CreateUnknownUserErrorResponse();

-            }

-

-            return ProfileToXml(userProfile);

-        }

-

     }

 }

diff --git a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj
index ba50752..a89a38d 100644
--- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj
+++ b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj
@@ -50,7 +50,7 @@
     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

-    <OutputPath>bin\</OutputPath>

+    <OutputPath>..\..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

diff --git a/OpenSim.build b/OpenSim.build
index 9eb05c7..a9a5fa5 100644
--- a/OpenSim.build
+++ b/OpenSim.build
@@ -47,6 +47,9 @@
         <delete dir="${bin.dir}" failonerror="false" />

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

         <nant buildfile="Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build" target="clean" />

+        <nant buildfile="Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="clean" />

+        <nant buildfile="Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="clean" />

+        <nant buildfile="Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build" target="clean" />

         <nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="clean" />

         <nant buildfile="OpenSim/OpenSim.Caches/OpenSim.Caches.dll.build" target="clean" />

         <nant buildfile="Common/OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" />

@@ -66,8 +69,6 @@
         <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" />

         <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="clean" />

         <nant buildfile="OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="clean" />

-        <nant buildfile="OpenSim/Examples/SimpleApp/SimpleApp.exe.build" target="clean" />

-        <nant buildfile="OpenSim/Examples/SimpleApp2/SimpleApp2.exe.build" target="clean" />

         <nant buildfile="Common/XmlRpcCS/XMLRPC.dll.build" target="clean" />

     </target>

 

@@ -76,8 +77,6 @@
         <nant buildfile="Common/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="build" />

         <nant buildfile="Common/OpenSim.Framework/OpenSim.Framework.dll.build" target="build" />

         <nant buildfile="Common/OpenSim.Servers/OpenSim.Servers.dll.build" target="build" />

-        <nant buildfile="Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build" target="build" />

-        <nant buildfile="OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.dll.build" target="build" />

         <nant buildfile="OpenSim/OpenSim.Caches/OpenSim.Caches.dll.build" target="build" />

         <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" />

         <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="build" />

@@ -90,11 +89,14 @@
         <nant buildfile="OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="build" />

         <nant buildfile="Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="build" />

         <nant buildfile="OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="build" />

+        <nant buildfile="Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="build" />

+        <nant buildfile="Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="build" />

+        <nant buildfile="Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build" target="build" />

+        <nant buildfile="Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build" target="build" />

+        <nant buildfile="OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.dll.build" target="build" />

         <nant buildfile="OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" />

         <nant buildfile="OpenSim/OpenSim.Region/OpenSim.Region.dll.build" target="build" />

         <nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="build" />

-        <nant buildfile="OpenSim/Examples/SimpleApp/SimpleApp.exe.build" target="build" />

-        <nant buildfile="OpenSim/Examples/SimpleApp2/SimpleApp2.exe.build" target="build" />

     </target>

 

     <target name="build-release" depends="Release, init, build" description="Builds in Release mode" />

@@ -106,6 +108,9 @@
     <target name="doc" depends="build-release">

         <echo message="Generating all documentation from all builds" />

         <nant buildfile="Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build" target="doc" />

+        <nant buildfile="Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="doc" />

+        <nant buildfile="Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="doc" />

+        <nant buildfile="Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build" target="doc" />

         <nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="doc" />

         <nant buildfile="OpenSim/OpenSim.Caches/OpenSim.Caches.dll.build" target="doc" />

         <nant buildfile="Common/OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" />

@@ -125,8 +130,6 @@
         <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" />

         <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="doc" />

         <nant buildfile="OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="doc" />

-        <nant buildfile="OpenSim/Examples/SimpleApp/SimpleApp.exe.build" target="doc" />

-        <nant buildfile="OpenSim/Examples/SimpleApp2/SimpleApp2.exe.build" target="doc" />

         <nant buildfile="Common/XmlRpcCS/XMLRPC.dll.build" target="doc" />

     </target>

 

diff --git a/OpenSim.sln b/OpenSim.sln
index 3c2d95b..a3a1051 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -1,7 +1,13 @@
 Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual C# Express 2005

+# Visual Studio 2005

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Communications", "Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj", "{683344D5-0000-0000-0000-000000000000}"

 EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data", "Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj", "{62CDF671-0000-0000-0000-000000000000}"

+EndProject

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

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.UserManagement", "Common\OpenGrid.Framework.UserManager\OpenGrid.Framework.UserManagement.csproj", "{DA9A7391-0000-0000-0000-000000000000}"

+EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}"

 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Caches", "OpenSim\OpenSim.Caches\OpenSim.Caches.csproj", "{1938EB12-0000-0000-0000-000000000000}"

@@ -40,112 +46,179 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorag
 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}"

 EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApp", "OpenSim\Examples\SimpleApp\SimpleApp.csproj", "{24B12448-0000-0000-0000-000000000000}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApp2", "OpenSim\Examples\SimpleApp2\SimpleApp2.csproj", "{24DF2448-0000-0000-0000-000000000000}"

-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(ProjectConfigurationPlatforms) = postSolution

-                {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

-                {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

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

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

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

-                {1938EB12-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

-                {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

-                {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

-                {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

-                {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

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

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

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

-                {79CED992-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

-                {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

-                {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

-                {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

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

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

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

-                {196916AF-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

-                {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

-                {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

-                {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

-                {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

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

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

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

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

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

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

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

-                {24DF2448-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(ProjectDependencies) = postSolution

+    ({683344D5-0000-0000-0000-000000000000}).1 = ({62CDF671-0000-0000-0000-000000000000})

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

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

+    ({DA9A7391-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000})

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

+    ({DA9A7391-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})

+    ({DA9A7391-0000-0000-0000-000000000000}).5 = ({E88EF749-0000-0000-0000-000000000000})

+    ({DA9A7391-0000-0000-0000-000000000000}).6 = ({8BB20F0A-0000-0000-0000-000000000000})

+    ({DA9A7391-0000-0000-0000-000000000000}).10 = ({8E81D43C-0000-0000-0000-000000000000})

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

+    ({438A9556-0000-0000-0000-000000000000}).4 = ({1938EB12-0000-0000-0000-000000000000})

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

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

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

+    ({438A9556-0000-0000-0000-000000000000}).8 = ({79CED992-0000-0000-0000-000000000000})

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

+    ({438A9556-0000-0000-0000-000000000000}).10 = ({196916AF-0000-0000-0000-000000000000})

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

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

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

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

+    ({1938EB12-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})

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

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

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

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

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

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

+    ({B55C0B5D-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})

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

+    ({79CED992-0000-0000-0000-000000000000}).1 = ({683344D5-0000-0000-0000-000000000000})

+    ({79CED992-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000})

+    ({79CED992-0000-0000-0000-000000000000}).3 = ({DA9A7391-0000-0000-0000-000000000000})

+    ({79CED992-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})

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

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

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

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

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

+    ({196916AF-0000-0000-0000-000000000000}).3 = ({683344D5-0000-0000-0000-000000000000})

+    ({196916AF-0000-0000-0000-000000000000}).4 = ({1938EB12-0000-0000-0000-000000000000})

+    ({196916AF-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})

+    ({196916AF-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})

+    ({196916AF-0000-0000-0000-000000000000}).7 = ({E88EF749-0000-0000-0000-000000000000})

+    ({196916AF-0000-0000-0000-000000000000}).8 = ({8BE16150-0000-0000-0000-000000000000})

+    ({196916AF-0000-0000-0000-000000000000}).9 = ({8BB20F0A-0000-0000-0000-000000000000})

+    ({196916AF-0000-0000-0000-000000000000}).10 = ({2270B8FE-0000-0000-0000-000000000000})

+    ({196916AF-0000-0000-0000-000000000000}).13 = ({8E81D43C-0000-0000-0000-000000000000})

+    ({632E1BFD-0000-0000-0000-000000000000}).3 = ({1938EB12-0000-0000-0000-000000000000})

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

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

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

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

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

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

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

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

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

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

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

+    ({EE9E5D96-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})

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

+    ({E1B79ECF-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})

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

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

+  EndGlobalSection

+  GlobalSection(ProjectConfigurationPlatforms) = postSolution

+    {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

+    {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

+    {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

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

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

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

+    {DA9A7391-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

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

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

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

+    {1938EB12-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

+    {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

+    {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

+    {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

+    {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

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

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

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

+    {79CED992-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

+    {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

+    {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

+    {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

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

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

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

+    {196916AF-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

+    {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

+    {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

+    {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

+    {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

+    {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/OpenSim.LocalCommunications/CommunicationsLocal.cs b/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs
index fb7dc7d..795f99d 100644
--- a/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs
+++ b/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs
@@ -35,21 +35,19 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;

 using OpenGrid.Framework.Communications;

 

-using OpenSim.LocalCommunications.LocalUserManagement;

 

 namespace OpenSim.LocalCommunications

 {

     public class CommunicationsLocal : CommunicationsManager

     {

-        public LocalBackEndServices SandBoxManager = new LocalBackEndServices();

-        public LocalUserServices UserServices = new LocalUserServices();

+        public LocalBackEndServices SandBoxServices = new LocalBackEndServices();

+        protected LocalUserServices UserServices = new LocalUserServices();

     

         public CommunicationsLocal()

         {

-

             UserServer = UserServices;

-            GridServer = SandBoxManager;

-            InterRegion = SandBoxManager;

+            GridServer = SandBoxServices;

+            InterRegion = SandBoxServices;

         }

     }

 }

diff --git a/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/LocalUserServices.cs b/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/LocalUserServices.cs
deleted file mode 100644
index f438117..0000000
--- a/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/LocalUserServices.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-

-using OpenGrid.Framework.Communications;

-using OpenSim.Framework.User;

-

-using libsecondlife;

-

-namespace OpenSim.LocalCommunications.LocalUserManagement

-{

-    public class LocalUserServices : IUserServices

-    {

-        public UserProfileManager userProfileManager = new UserProfileManager();

-        public LocalLoginService localLoginService;

-        public LocalUserServices()

-        {

-            localLoginService  = new LocalLoginService(this);

-        }

-

-        public UserProfile GetUserProfile(string first_name, string last_name)

-        {

-            return GetUserProfile(first_name + " " + last_name);

-        }

-

-        public UserProfile GetUserProfile(string name)

-        {

-            return null;

-        }

-        public UserProfile GetUserProfile(LLUUID avatar_id)

-        {

-            return null;

-        }

-

-    }

-}

diff --git a/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/UserProfileManager.cs b/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/UserProfileManager.cs
deleted file mode 100644
index 5f9d028..0000000
--- a/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/UserProfileManager.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-

-using libsecondlife;

-using OpenSim.Framework.User;

-

-namespace OpenSim.LocalCommunications.LocalUserManagement

-{

-    public class UserProfileManager

-    {

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

-

-        public UserProfileManager()

-        {

-        }

-

-        private LLUUID getUserUUID(string first_name, string last_name)

-        {

-            return getUserUUID(first_name + " " + last_name);

-        }

-        private LLUUID getUserUUID(string name)

-        {

-            return null;

-        }

-

-

-        public UserProfile getUserProfile(string first_name, string last_name)

-        {

-            return getUserProfile(first_name + " " + last_name);

-        }

-        public UserProfile getUserProfile(string name)

-        {

-            return null;

-        }

-        public UserProfile getUserProfile(LLUUID user_id)

-        {

-            return null;

-        }

-

-    }

-}

diff --git a/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs b/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs
new file mode 100644
index 0000000..0fe52a7
--- /dev/null
+++ b/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs
@@ -0,0 +1,43 @@
+using System;

+using System.Collections;

+using System.Collections.Generic;

+using System.Text;

+

+using OpenGrid.Framework.Communications;

+using OpenSim.Framework.User;

+using OpenGrid.Framework.UserManagement;

+using OpenGrid.Framework.Data;

+

+using libsecondlife;

+

+namespace OpenSim.LocalCommunications

+{

+    public class LocalUserServices : UserManagerBase, IUserServices

+    {

+       

+        public LocalUserServices()

+        {

+

+        }

+

+        public UserProfileData GetUserProfile(string first_name, string last_name)

+        {

+            return GetUserProfile(first_name + " " + last_name);

+        }

+

+        public UserProfileData GetUserProfile(string name)

+        {

+            return null;

+        }

+        public UserProfileData GetUserProfile(LLUUID avatar_id)

+        {

+            return null;

+        }

+

+        public override void CustomiseResponse(ref Hashtable response, ref UserProfileData theUser)

+        {

+

+        }

+

+    }

+}

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

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

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

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

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

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

-    <ApplicationIcon>

-    </ApplicationIcon>

+    <ApplicationIcon></ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenSim.LocalCommunications</AssemblyName>

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

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder>

-    </AppDesignerFolder>

+    <AppDesignerFolder></AppDesignerFolder>

     <RootNamespace>OpenSim.LocalCommunications</RootNamespace>

-    <StartupObject>

-    </StartupObject>

+    <StartupObject></StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

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

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

+    <DocumentationFile></DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

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

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn>

-    </NoWarn>

+    <NoWarn></NoWarn>

   </PropertyGroup>

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

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

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

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

+    <DocumentationFile></DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

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

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn>

-    </NoWarn>

+    <NoWarn></NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="libsecondlife.dll">

+    <Reference Include="libsecondlife.dll" >

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

       <Private>False</Private>

     </Reference>

-    <Reference Include="System">

+    <Reference Include="System" >

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Data" />

-    <Reference Include="System.Xml">

+    <Reference Include="System.Xml" >

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

       <Private>False</Private>

     </Reference>

@@ -84,13 +76,25 @@
       <Name>OpenGrid.Framework.Communications</Name>

       <Project>{683344D5-0000-0000-0000-000000000000}</Project>

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

-      <Private>False</Private>

+                        <Private>False</Private>

+    </ProjectReference>

+    <ProjectReference Include="..\..\Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">

+      <Name>OpenGrid.Framework.Data</Name>

+      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>

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

+                        <Private>False</Private>

+    </ProjectReference>

+    <ProjectReference Include="..\..\Common\OpenGrid.Framework.UserManager\OpenGrid.Framework.UserManagement.csproj">

+      <Name>OpenGrid.Framework.UserManagement</Name>

+      <Project>{DA9A7391-0000-0000-0000-000000000000}</Project>

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

+                        <Private>False</Private>

     </ProjectReference>

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

       <Name>OpenSim.Framework</Name>

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

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

-      <Private>False</Private>

+                        <Private>False</Private>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

@@ -100,9 +104,9 @@
     <Compile Include="LocalBackEndServices.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="LocalUserManagement\LocalLoginService.cs" />

-    <Compile Include="LocalUserManagement\LocalUserServices.cs" />

-    <Compile Include="LocalUserManagement\UserProfileManager.cs" />

+    <Compile Include="LocalUserServices.cs">

+      <SubType>Code</SubType>

+    </Compile>

     <Compile Include="Properties\AssemblyInfo.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -114,4 +118,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

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

diff --git a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj.user b/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj.user
index 518ce40..5941547 100644
--- a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj.user
+++ b/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj.user
@@ -2,7 +2,7 @@
   <PropertyGroup>

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

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

-    <ReferencePath>C:\Documents and Settings\Stefan\My Documents\source\opensim\branches\Sugilite\bin\</ReferencePath>

+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\Sugilite\bin\</ReferencePath>

     <LastOpenVersion>8.0.50727</LastOpenVersion>

     <ProjectView>ProjectFiles</ProjectView>

     <ProjectTrust>0</ProjectTrust>

diff --git a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.dll.build b/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.dll.build
index 2ea6497..2b72e2d 100644
--- a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.dll.build
+++ b/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.dll.build
@@ -13,6 +13,7 @@
             <sources failonempty="true">

                 <include name="CommunicationsLocal.cs" />

                 <include name="LocalBackEndServices.cs" />

+                <include name="LocalUserServices.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

             </sources>

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

@@ -22,6 +23,8 @@
                 </lib>

                 <include name="../../bin/libsecondlife.dll" />

                 <include name="../../bin/OpenGrid.Framework.Communications.dll" />

+                <include name="../../bin/OpenGrid.Framework.Data.dll" />

+                <include name="../../bin/OpenGrid.Framework.UserManagement.dll" />

                 <include name="../../bin/OpenSim.Framework.dll" />

                 <include name="System.dll" />

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

diff --git a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
index 5f8b0ed..f88eb32 100644
--- a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
+++ b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
@@ -50,7 +50,7 @@
     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

-    <OutputPath>bin\</OutputPath>

+    <OutputPath>..\..\..\bin\Physics\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

diff --git a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj b/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
index 22d7786..08f54aa 100644
--- a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
+++ b/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
@@ -50,7 +50,7 @@
     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

-    <OutputPath>bin\</OutputPath>

+    <OutputPath>..\..\..\bin\Physics\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

diff --git a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
index 0cebe66..aa89cc1 100644
--- a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
+++ b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
@@ -50,7 +50,7 @@
     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

-    <OutputPath>bin\</OutputPath>

+    <OutputPath>..\..\..\bin\Physics\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
index 2a5d6ec..94efbed 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
@@ -50,7 +50,7 @@
     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

-    <OutputPath>bin\</OutputPath>

+    <OutputPath>..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 17a651d..63eeb9c 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -50,7 +50,7 @@
     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

-    <OutputPath>bin\</OutputPath>

+    <OutputPath>..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
index 10bc0fd..694521b 100644
--- a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
+++ b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
@@ -50,7 +50,7 @@
     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

-    <OutputPath>bin\</OutputPath>

+    <OutputPath>..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

diff --git a/OpenSim/OpenSim/OpenSim.csproj b/OpenSim/OpenSim/OpenSim.csproj
index df3a32c..fb0e0c1 100644
--- a/OpenSim/OpenSim/OpenSim.csproj
+++ b/OpenSim/OpenSim/OpenSim.csproj
@@ -50,7 +50,7 @@
     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

-    <OutputPath>bin\</OutputPath>

+    <OutputPath>..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index dddcaea..762b9e1 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -134,7 +134,7 @@ namespace OpenSim
             {

                 loginServer = new LoginServer(regionData[0].IPListenAddr, regionData[0].IPListenPort, regionData[0].RegionLocX, regionData[0].RegionLocY, false);

                 loginServer.Startup();

-                loginServer.SetSessionHandler(sandboxCommunications.SandBoxManager.AddNewSession);

+                loginServer.SetSessionHandler(sandboxCommunications.SandBoxServices.AddNewSession);

                 //sandbox mode with loginserver not using accounts

                 httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.XmlRpcLoginMethod);

             }

diff --git a/Prebuild/Prebuild.build b/Prebuild/Prebuild.build
index c6c4660..395fb31 100644
--- a/Prebuild/Prebuild.build
+++ b/Prebuild/Prebuild.build
@@ -12,6 +12,13 @@
         <property name="build.debug" value="true" />

     </target>

 

+    <property name="project.config" value="Release" />

+

+    <target name="Release" description="">

+        <property name="project.config" value="Release" />

+        <property name="build.debug" value="false" />

+    </target>

+

     <target name="net-1.1" description="Sets framework to .NET 1.1">

         <property name="nant.settings.currentframework" value="net-1.1" />

     </target>

diff --git a/Prebuild/Prebuild.sln b/Prebuild/Prebuild.sln
index 440c8ba..449896b 100644
--- a/Prebuild/Prebuild.sln
+++ b/Prebuild/Prebuild.sln
@@ -5,10 +5,13 @@ EndProject
 Global

   GlobalSection(SolutionConfigurationPlatforms) = preSolution

     Debug|Any CPU = Debug|Any CPU

+    Release|Any CPU = Release|Any CPU

   EndGlobalSection

   GlobalSection(ProjectConfigurationPlatforms) = postSolution

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

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

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

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

   EndGlobalSection

   GlobalSection(SolutionProperties) = preSolution

     HideSolutionNode = FALSE

diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj
index bda6129..c8b859c 100644
--- a/Prebuild/src/Prebuild.csproj
+++ b/Prebuild/src/Prebuild.csproj
@@ -41,6 +41,24 @@
     <WarningLevel>4</WarningLevel>

     <NoWarn>1595</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>1595</NoWarn>

+  </PropertyGroup>

   <ItemGroup>

     <Reference Include="System" >

       <HintPath>System.dll</HintPath>

diff --git a/prebuild.xml b/prebuild.xml
index 6b25abd..cbe688d 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -33,7 +33,7 @@
     </Configuration>

 

     <!-- XML-RPC -->

-    <Project name="XMLRPC" path="Common/XmlRpcCS" type="Library">

+     <Project name="XMLRPC" path="Common/XmlRpcCS" type="Library">

       <Configuration name="Debug">

         <Options>

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

@@ -93,7 +93,7 @@
       <Reference name="libsecondlife.dll"/>

       <Reference name="Db4objects.Db4o.dll"/>

       <Reference name="XMLRPC"/>

-      <Reference name="OpenSim.Framework.Console"/>

+        <Reference name="OpenSim.Framework.Console"/>

       <Files>

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

       </Files>

@@ -114,58 +114,10 @@
       <ReferencePath>../../bin/</ReferencePath>

       <Reference name="System"/>

       <Reference name="System.Xml"/>

-      <Reference name="OpenSim.Framework"/>

-      <Reference name="OpenSim.Framework.Console"/>

-      <Reference name="libsecondlife.dll"/>

-      <Reference name="XMLRPC"/>

-

-      <Files>

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

-      </Files>

-    </Project>

-

-    <!-- OpenGridFrameWork.Communications" -->

-    <Project name="OpenGrid.Framework.Communications" path="Common/OpenGrid.Framework.Communications" type="Library">

-      <Configuration name="Debug">

-        <Options>

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

-        </Options>

-      </Configuration>

-      <Configuration name="Release">

-        <Options>

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

-        </Options>

-      </Configuration>

-

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

-      <Reference name="System"/>

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

-      <Reference name="OpenSim.Framework"/>

-      <Reference name="libsecondlife.dll"/>

-

-      <Files>

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

-      </Files>

-    </Project>

-

-    <Project name="OpenSim.LocalCommunications" path="OpenSim/OpenSim.LocalCommunications" type="Library">

-      <Configuration name="Debug">

-        <Options>

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

-        </Options>

-      </Configuration>

-      <Configuration name="Release">

-        <Options>

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

-        </Options>

-      </Configuration>

-

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

-      <Reference name="System"/>

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

-      <Reference name="OpenGrid.Framework.Communications"/>

-      <Reference name="libsecondlife.dll"/>

-      <Reference name="OpenSim.Framework"/>

+     <Reference name="OpenSim.Framework"/>

+     <Reference name="OpenSim.Framework.Console"/>

+     <Reference name="libsecondlife.dll"/>

+     <Reference name="XMLRPC"/>

 

       <Files>

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

@@ -188,7 +140,7 @@
       <Reference name="System"/>

       <Reference name="System.Xml"/>

       <Reference name="libsecondlife.dll"/>

-      <Reference name="OpenSim.Framework"/>

+        <Reference name="OpenSim.Framework"/>

       <Files>

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

       </Files>

@@ -219,7 +171,7 @@
         <Match pattern="*.cs" recurse="true"/>

       </Files>

     </Project>

-

+    

     <Project name="OpenSim.Storage.LocalStorageSQLite" path="OpenSim/OpenSim.Storage/LocalStorageSQLite" type="Library">

       <Configuration name="Debug">

         <Options>

@@ -319,7 +271,7 @@
         <Match pattern="*.cs" recurse="true"/>

       </Files>

     </Project>

-

+    

 

     <Project name="OpenSim.Physics.Manager" path="OpenSim/OpenSim.Physics/Manager" type="Library">

       <Configuration name="Debug">

@@ -352,6 +304,11 @@
           <OutputPath>../../../bin/Physics/</OutputPath>

         </Options>

       </Configuration>

+      <Configuration name="Release">

+        <Options>

+          <OutputPath>../../../bin/Physics/</OutputPath>

+        </Options>

+      </Configuration>

 

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

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

@@ -368,6 +325,11 @@
           <OutputPath>../../../bin/Physics/</OutputPath>

         </Options>

       </Configuration>

+      <Configuration name="Release">

+        <Options>

+          <OutputPath>../../../bin/Physics/</OutputPath>

+        </Options>

+      </Configuration>

 

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

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

@@ -385,43 +347,58 @@
           <OutputPath>../../../bin/Physics/</OutputPath>

         </Options>

       </Configuration>

+      <Configuration name="Release">

+        <Options>

+          <OutputPath>../../../bin/Physics/</OutputPath>

+        </Options>

+      </Configuration>

 

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

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

       <Reference name="Axiom.MathLib.dll" localCopy="false"/>

       <Reference name="OpenSim.Physics.Manager" localCopy="false"/>

-      <Reference name="Ode.NET.dll" localCopy="false" />

+      <Reference name="Ode.NET.dll" localCopy="false" />      

 

       <Files>

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

       </Files>

     </Project>

 

-    <!-- Xml Config Dll -->

-    <Project name="OpenSim.GenericConfig.Xml" path="Common/OpenSim.GenericConfig/Xml" type="Library">

+     <!-- Xml Config Dll -->

+     <Project name="OpenSim.GenericConfig.Xml" path="Common/OpenSim.GenericConfig/Xml" type="Library">

       <Configuration name="Debug">

         <Options>

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

         </Options>

       </Configuration>

+      <Configuration name="Release">

+        <Options>

+          <OutputPath>../../../bin/</OutputPath>

+        </Options>

+      </Configuration>

 

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

       <Reference name="System"/>

       <Reference name="System.Xml"/>

-      <Reference name="OpenSim.Framework"/>

+     <Reference name="OpenSim.Framework"/>

 

       <Files>

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

       </Files>

     </Project>

 

-    <!-- Terrain engine -->

-    <Project name="OpenSim.Terrain.BasicTerrain" path="OpenSim/OpenSim.Terrain.BasicTerrain" type="Library">

+     <!-- Terrain engine -->

+     <Project name="OpenSim.Terrain.BasicTerrain" path="OpenSim/OpenSim.Terrain.BasicTerrain" type="Library">

       <Configuration name="Debug">

         <Options>

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

         </Options>

       </Configuration>

+      <Configuration name="Release">

+        <Options>

+          <OutputPath>../../bin/</OutputPath>

+        </Options>

+      </Configuration>

 

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

       <Reference name="System"/>

@@ -436,69 +413,145 @@
       </Files>

     </Project>

 

-    <Project name="OpenSim.RegionServer" path="OpenSim/OpenSim.RegionServer" type="Library">

+    <Project name="OpenGrid.Framework.Data" path="Common/OpenGrid.Framework.Data" type="Library">

       <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.Xml"/>

+      <Reference name="System.Data"/>

       <Reference name="libsecondlife.dll"/>

-      <Reference name="Axiom.MathLib.dll"/>

-      <Reference name="Db4objects.Db4o.dll"/>

-      <Reference name="OpenSim.Terrain.BasicTerrain"/>

-      <Reference name="OpenSim.Framework"/>

-      <Reference name="OpenSim.Framework.Console"/>

-      <Reference name="OpenSim.GenericConfig.Xml"/>

-      <Reference name="OpenSim.Physics.Manager"/>

-      <Reference name="OpenSim.Servers"/>

-      <Reference name="OpenSim.Caches"/>

-      <Reference name="XMLRPC"/>

-

       <Files>

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

       </Files>

     </Project>

 

-

-    <Project name="OpenSim.Region" path="OpenSim/OpenSim.Region" type="Library">

+    <Project name="OpenGrid.Framework.Data.DB4o" path="Common/OpenGrid.Framework.Data.DB4o" type="Library">

       <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.Xml"/>

+      <Reference name="System.Data"/>

+      <Reference name="OpenGrid.Framework.Data"/>

       <Reference name="libsecondlife.dll"/>

-      <Reference name="Axiom.MathLib.dll"/>

       <Reference name="Db4objects.Db4o.dll"/>

-      <Reference name="OpenSim.Terrain.BasicTerrain"/>

-      <Reference name="OpenSim.Framework"/>

-      <Reference name="OpenSim.Framework.Console"/>

-      <Reference name="OpenSim.GenericConfig.Xml"/>

-      <Reference name="OpenSim.Physics.Manager"/>

-      <Reference name="OpenSim.Servers"/>

-      <Reference name="OpenSim.Caches"/>

-      <Reference name="XMLRPC"/>

-      <Reference name="OpenGrid.Framework.Communications"/>

+      <Files>

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

+      </Files>

+    </Project>

+

+    <Project name="OpenGrid.Framework.UserManagement" path="Common/OpenGrid.Framework.UserManager" type="Library">

+      <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.Data" localCopy="false"/>

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

+     <Reference name="OpenSim.Framework"/>

+     <Reference name="OpenSim.Framework.Console"/>

+     <Reference name="OpenGrid.Framework.Data"/>

+     <Reference name="OpenSim.GenericConfig.Xml"/>

+     <Reference name="OpenSim.Servers"/>

+     <Reference name="libsecondlife.dll"/>

+     <Reference name="Db4objects.Db4o.dll"/>

+     <Reference name="XMLRPC"/>

+

+     <Files>

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

+     </Files> 

+    </Project>

+

+    <!-- OpenGridFrameWork.Communications" -->

+        <Project name="OpenGrid.Framework.Communications" path="Common/OpenGrid.Framework.Communications" type="Library">

+      <Configuration name="Debug">

+        <Options>

+          <OutputPath>../../bin/</OutputPath>

+        </Options>

+      </Configuration>

+      <Configuration name="Release">

+        <Options>

+          <OutputPath>../../bin/</OutputPath>

+        </Options>

+      </Configuration>

+

+      <ReferencePath>../../bin/</ReferencePath>

+      <Reference name="System"/>

+      <Reference name="System.Xml"/>

+     <Reference name="OpenSim.Framework"/>

+     <Reference name="OpenGrid.Framework.Data" />

+     <Reference name="libsecondlife.dll"/>

 

       <Files>

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

       </Files>

     </Project>

 

-    <!-- OpenSim app -->

-    <Project name="OpenSim" path="OpenSim/OpenSim" type="Exe">

+    <Project name="OpenSim.LocalCommunications" path="OpenSim/OpenSim.LocalCommunications" type="Library">

       <Configuration name="Debug">

         <Options>

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

         </Options>

       </Configuration>

+      <Configuration name="Release">

+        <Options>

+          <OutputPath>../../bin/</OutputPath>

+        </Options>

+      </Configuration>

+

+      <ReferencePath>../../bin/</ReferencePath>

+      <Reference name="System"/>

+      <Reference name="System.Xml"/>

+     <Reference name="OpenGrid.Framework.Communications"/>

+     <Reference name="OpenGrid.Framework.UserManagement" />

+     <Reference name="OpenGrid.Framework.Data" />

+     <Reference name="libsecondlife.dll"/>

+        <Reference name="OpenSim.Framework"/>

+

+      <Files>

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

+      </Files>

+    </Project>

+

+

+    <Project name="OpenSim.RegionServer" path="OpenSim/OpenSim.RegionServer" type="Library">

+      <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"/>

@@ -509,81 +562,92 @@
       <Reference name="OpenSim.Terrain.BasicTerrain"/>

       <Reference name="OpenSim.Framework"/>

       <Reference name="OpenSim.Framework.Console"/>

+      <Reference name="OpenSim.GenericConfig.Xml"/>

       <Reference name="OpenSim.Physics.Manager"/>

       <Reference name="OpenSim.Servers"/>

-      <Reference name="OpenSim.Region"/>

-      <Reference name="OpenSim.RegionServer"/>

-      <Reference name="OpenSim.GenericConfig.Xml"/>

-      <Reference name="OpenGrid.Framework.Communications"/>

       <Reference name="OpenSim.Caches"/>

       <Reference name="XMLRPC"/>

-      <Reference name="OpenSim.LocalCommunications"/>

 

       <Files>

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

       </Files>

     </Project>

 

-    <!-- Scene Server API Example Apps -->

 

-    <Project name="SimpleApp" path="OpenSim/Examples/SimpleApp" type="Exe">

+    <Project name="OpenSim.Region" path="OpenSim/OpenSim.Region" type="Library">

       <Configuration name="Debug">

         <Options>

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

+          <OutputPath>../../bin/</OutputPath>

+        </Options>

+      </Configuration>

+      <Configuration name="Release">

+        <Options>

+          <OutputPath>../../bin/</OutputPath>

         </Options>

       </Configuration>

 

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

-

-      <Reference name="libsecondlife.dll"/>

+      <ReferencePath>../../bin/</ReferencePath>

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

-      <Reference name="System.Data.dll"/>

       <Reference name="System.Xml"/>

-

-      <Reference name="OpenSim.Framework.Console"/>

+      <Reference name="libsecondlife.dll"/>

+      <Reference name="Axiom.MathLib.dll"/>

+      <Reference name="Db4objects.Db4o.dll"/>

+      <Reference name="OpenSim.Terrain.BasicTerrain"/>

       <Reference name="OpenSim.Framework"/>

-      <Reference name="XMLRPC"/>

-      <Reference name="OpenSim.GridInterfaces.Local"/>

+      <Reference name="OpenSim.Framework.Console"/>

+      <Reference name="OpenSim.GenericConfig.Xml"/>

+      <Reference name="OpenSim.Physics.Manager"/>

       <Reference name="OpenSim.Servers"/>

-      <Reference name="OpenSim.Caches"/>

-      <Reference name="OpenSim.RegionServer"/>

+        <Reference name="OpenSim.Caches"/>

+      <Reference name="XMLRPC"/>

+      <Reference name="OpenGrid.Framework.Communications"/>

 

       <Files>

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

       </Files>

     </Project>

 

-    <Project name="SimpleApp2" path="OpenSim/Examples/SimpleApp2" type="Exe">

+    <!-- OpenSim app -->

+    <Project name="OpenSim" path="OpenSim/OpenSim" type="Exe">

       <Configuration name="Debug">

         <Options>

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

+          <OutputPath>../../bin/</OutputPath>

+        </Options>

+      </Configuration>

+      <Configuration name="Release">

+        <Options>

+          <OutputPath>../../bin/</OutputPath>

         </Options>

       </Configuration>

 

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

-

-      <Reference name="libsecondlife.dll"/>

+      <ReferencePath>../../bin/</ReferencePath>

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

-      <Reference name="System.Data.dll"/>

       <Reference name="System.Xml"/>

-

-      <Reference name="OpenSim.Framework.Console"/>

+      <Reference name="libsecondlife.dll"/>

+      <Reference name="Axiom.MathLib.dll"/>

+      <Reference name="Db4objects.Db4o.dll"/>

+      <Reference name="OpenSim.Terrain.BasicTerrain"/>

       <Reference name="OpenSim.Framework"/>

-      <Reference name="XMLRPC"/>

-      <Reference name="OpenSim.GridInterfaces.Local"/>

+      <Reference name="OpenSim.Framework.Console"/>

+      <Reference name="OpenSim.Physics.Manager"/>

       <Reference name="OpenSim.Servers"/>

-      <Reference name="OpenSim.Caches"/>

+         <Reference name="OpenSim.Region"/>

       <Reference name="OpenSim.RegionServer"/>

+      <Reference name="OpenSim.GenericConfig.Xml"/>

+        <Reference name="OpenGrid.Framework.Communications"/>

+        <Reference name="OpenSim.Caches"/>

+      <Reference name="XMLRPC"/>

+      <Reference name="OpenSim.LocalCommunications"/>

 

       <Files>

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

       </Files>

     </Project>

-

-  </Solution>

-

-

-  <Solution name="OpenGridServices" activeConfig="Debug" path="./">

+  

+</Solution>

+  

+  

+<Solution name="OpenGridServices" activeConfig="Debug" path="./">

     <Configuration name="Debug">

       <Options>

         <CompilerDefines>TRACE;DEBUG</CompilerDefines>

@@ -615,9 +679,9 @@
       </Options>

     </Configuration>

 

-

-    <!-- OpenGrid Data Services -->

-    <Project name="OpenGrid.Framework.Data" path="OpenGridServices/OpenGrid.Framework.Data" type="Library">

+ 

+  <!-- OpenGrid Data Services -->

+    <Project name="OpenGrid.Framework.Data" path="Common/OpenGrid.Framework.Data" type="Library">

       <Configuration name="Debug">

         <Options>

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

@@ -663,7 +727,7 @@
       </Files>

     </Project>

 

-    <Project name="OpenGrid.Framework.Data.DB4o" path="OpenGridServices/OpenGrid.Framework.Data.DB4o" type="Library">

+    <Project name="OpenGrid.Framework.Data.DB4o" path="Common/OpenGrid.Framework.Data.DB4o" type="Library">

       <Configuration name="Debug">

         <Options>

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

@@ -734,9 +798,9 @@
       </Files>

     </Project>

 

-    <!-- OGS projects -->

-

-    <Project name="OpenGrid.Framework.Manager" path="OpenGridServices/OpenGrid.Framework.Manager" type="Library">

+    <!-- OGS projects -->    

+   

+   <Project name="OpenGrid.Framework.Manager" path="OpenGridServices/OpenGrid.Framework.Manager" type="Library">

       <Configuration name="Debug">

         <Options>

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

@@ -748,19 +812,19 @@
         </Options>

       </Configuration>

 

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

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

-      <Reference name="OpenSim.Framework"/>

-      <Reference name="OpenSim.Servers"/>

-      <Reference name="libsecondlife.dll"/>

-      <Reference name="XMLRPC"/>

+     <ReferencePath>../../bin/</ReferencePath>

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

+     <Reference name="OpenSim.Framework"/>

+     <Reference name="OpenSim.Servers"/>

+     <Reference name="libsecondlife.dll"/>

+     <Reference name="XMLRPC"/>

 

 

-      <Files>

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

-      </Files>

+     <Files>

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

+     </Files>

     </Project>

-

+ 

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

       <Configuration name="Debug">

         <Options>

@@ -773,26 +837,26 @@
         </Options>

       </Configuration>

 

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

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

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

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

-      <Reference name="OpenSim.Framework"/>

-      <Reference name="OpenSim.Framework.Console"/>

-      <Reference name="OpenSim.Servers"/>

-      <Reference name="OpenGrid.Framework.Data"/>

-      <Reference name="OpenGrid.Framework.Manager"/>

-      <Reference name="OpenSim.GenericConfig.Xml"/>

-      <Reference name="libsecondlife.dll"/>

-      <Reference name="Db4objects.Db4o.dll"/>

-      <Reference name="XMLRPC"/>

-

-      <Files>

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

-      </Files>

+     <ReferencePath>../../bin/</ReferencePath>

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

+     <Reference name="System.Data" localCopy="false"/>

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

+     <Reference name="OpenSim.Framework"/>

+     <Reference name="OpenSim.Framework.Console"/>

+     <Reference name="OpenSim.Servers"/>

+     <Reference name="OpenGrid.Framework.Data"/>

+     <Reference name="OpenGrid.Framework.Manager"/>

+     <Reference name="OpenSim.GenericConfig.Xml"/>

+     <Reference name="libsecondlife.dll"/>

+     <Reference name="Db4objects.Db4o.dll"/>

+     <Reference name="XMLRPC"/>

+

+     <Files>

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

+     </Files>

     </Project>

 

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

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

       <Configuration name="Debug">

         <Options>

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

@@ -804,20 +868,50 @@
         </Options>

       </Configuration>

 

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

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

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

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

-      <Reference name="OpenSim.Framework"/>

-      <Reference name="OpenSim.Framework.Console"/>

-      <Reference name="OpenSim.Servers"/>

-      <Reference name="libsecondlife.dll"/>

-      <Reference name="Db4objects.Db4o.dll"/>

-      <Reference name="XMLRPC"/>

+     <ReferencePath>../../bin/</ReferencePath>

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

+     <Reference name="System.Data" localCopy="false"/>

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

+     <Reference name="OpenSim.Framework"/>

+     <Reference name="OpenSim.Framework.Console"/>

+     <Reference name="OpenSim.Servers"/>

+     <Reference name="libsecondlife.dll"/>

+     <Reference name="Db4objects.Db4o.dll"/>

+     <Reference name="XMLRPC"/>

+

+     <Files>

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

+     </Files>

+    </Project>

 

-      <Files>

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

-      </Files>

+    <Project name="OpenGrid.Framework.UserManagement" path="Common/OpenGrid.Framework.UserManager" type="Library">

+      <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.Data" localCopy="false"/>

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

+     <Reference name="OpenSim.Framework"/>

+     <Reference name="OpenSim.Framework.Console"/>

+     <Reference name="OpenGrid.Framework.Data"/>

+     <Reference name="OpenSim.GenericConfig.Xml"/>

+     <Reference name="OpenSim.Servers"/>

+     <Reference name="libsecondlife.dll"/>

+     <Reference name="Db4objects.Db4o.dll"/>

+     <Reference name="XMLRPC"/>

+

+     <Files>

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

+     </Files> 

     </Project>

 

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

@@ -831,25 +925,27 @@
           <OutputPath>../../bin/</OutputPath>

         </Options>

       </Configuration>

-

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

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

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

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

-      <Reference name="OpenSim.Framework"/>

-      <Reference name="OpenSim.Framework.Console"/>

-      <Reference name="OpenGrid.Framework.Data"/>

-      <Reference name="OpenSim.GenericConfig.Xml"/>

-      <Reference name="OpenSim.Servers"/>

-      <Reference name="libsecondlife.dll"/>

-      <Reference name="Db4objects.Db4o.dll"/>

-      <Reference name="XMLRPC"/>

-

-      <Files>

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

-      </Files>

+      

+     <ReferencePath>../../bin/</ReferencePath>

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

+     <Reference name="System.Data" localCopy="false"/>

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

+     <Reference name="OpenSim.Framework"/>

+     <Reference name="OpenSim.Framework.Console"/>

+     <Reference name="OpenGrid.Framework.Data"/>

+     <Reference name="OpenSim.GenericConfig.Xml"/>

+     <Reference name="OpenSim.Servers"/>

+     <Reference name="OpenGrid.Framework.UserManager" />

+     <Reference name="libsecondlife.dll"/>

+     <Reference name="Db4objects.Db4o.dll"/>

+     <Reference name="XMLRPC"/>

+

+     <Files>

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

+     </Files> 

     </Project>

 

+    

 

 

     <Project name="OpenGrid.Config.GridConfigDb4o" path="OpenGridServices/OpenGrid.Config/GridConfigDb4o" type="Library">

@@ -883,6 +979,11 @@
           <OutputPath>../../../bin/</OutputPath>

         </Options>

       </Configuration>

+      <Configuration name="Release">

+        <Options>

+          <OutputPath>../../../bin/</OutputPath>

+        </Options>

+      </Configuration>

 

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

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

@@ -896,9 +997,10 @@
         <Match pattern="*.cs" recurse="true"/>

       </Files>

     </Project>

-  </Solution>

-

-

+  

+</Solution>

+  

+  

   <!-- Prebuild tool -->

   <Solution name="Prebuild" path="Prebuild/" >

     <Configuration name="Debug">

@@ -910,6 +1012,15 @@
         <SuppressWarnings>1595</SuppressWarnings>

       </Options>

     </Configuration>

+    <Configuration name="Release">

+      <Options>

+        <CompilerDefines>TRACE</CompilerDefines>

+        <OutputPath>bin/Release</OutputPath>

+        <OptimizeCode>true</OptimizeCode>

+        <DebugInformation>false</DebugInformation>

+        <SuppressWarnings>1595</SuppressWarnings>

+      </Options>

+    </Configuration>

     <Project name="Prebuild" path="src/" language="C#" assemblyName="Prebuild" icon="App.ico" type="Exe" rootNamespace="Prebuild" startupObject="Prebuild.Prebuild">

       <Configuration name="Debug">

         <Options>

@@ -921,6 +1032,16 @@
           <SuppressWarnings>1595</SuppressWarnings>

         </Options>

       </Configuration>

+      <Configuration name="Release">

+        <Options>

+          <CompilerDefines>TRACE</CompilerDefines>

+          <OutputPath>..\..\bin\</OutputPath>

+          <OptimizeCode>true</OptimizeCode>

+          <DebugInformation>false</DebugInformation>

+          <KeyFile>Prebuild.snk</KeyFile>

+          <SuppressWarnings>1595</SuppressWarnings>

+        </Options>

+      </Configuration>

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

       <Reference name="System.EnterpriseServices" />

       <Reference name="System.Xml" />