Made a base class from the Grid mode UserServer.UserManager and included that in the OpenSim solution.

Included OpenGrid.Framework.Data in the OpenSim solution (and OpenGrid.Framework.Data.DB4O). Changed OpenSim.LocalCommunications.LocalUserServices so that it inherits from the UserManagement Base class. (still not finished implementing the CustomiseResponse() method)
author: MW 2007-06-19 10:40:20 +0000
committer: MW 2007-06-19 10:40:20 +0000
commit: 320fbcb7b4179968994100d0819da2e0732451ef (patch)
tree: 7babe0b5a0b7d3c4a46cd3f7a6198565d5e31e76 /Common
parent: * Cleaning up unused zircon branch. (diff)
download: opensim-SC_OLD-320fbcb7b4179968994100d0819da2e0732451ef.zip
opensim-SC_OLD-320fbcb7b4179968994100d0819da2e0732451ef.tar.gz
opensim-SC_OLD-320fbcb7b4179968994100d0819da2e0732451ef.tar.bz2
opensim-SC_OLD-320fbcb7b4179968994100d0819da2e0732451ef.tar.xz
35 files changed, 1136 insertions, 26 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);
+        UserProfileData GetUserProfile(string first_name, string last_name);
-        UserProfile GetUserProfile(string name);
+        UserProfileData GetUserProfile(string name);
-        UserProfile GetUserProfile(LLUUID avatar_id);
+        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>
author	MW	2007-06-19 10:40:20 +0000
committer	MW	2007-06-19 10:40:20 +0000
commit	320fbcb7b4179968994100d0819da2e0732451ef (patch)
tree	7babe0b5a0b7d3c4a46cd3f7a6198565d5e31e76 /Common
parent	* Cleaning up unused zircon branch. (diff)
download	opensim-SC_OLD-320fbcb7b4179968994100d0819da2e0732451ef.zip opensim-SC_OLD-320fbcb7b4179968994100d0819da2e0732451ef.tar.gz opensim-SC_OLD-320fbcb7b4179968994100d0819da2e0732451ef.tar.bz2 opensim-SC_OLD-320fbcb7b4179968994100d0819da2e0732451ef.tar.xz