25 files changed, 186 insertions, 188 deletions
diff --git a/OGS.sql b/OGS.sql
deleted file mode 100644
index 5efaf97..0000000
--- a/OGS.sql
+++ /dev/null
@@ -1,134 +0,0 @@
-- phpMyAdmin SQL Dump
-- version 2.6.3-pl1
-- http://www.phpmyadmin.net
-- 
-- Host: 127.0.0.1
-- Generation Time: Feb 16, 2007 at 09:54 PM
-- Server version: 4.0.23
-- PHP Version: 4.4.0
-- 
-- Database: `OGS`
-- 
-- --------------------------------------------------------
-- 
-- Table structure for table `Grid_settings`
-- 
-DROP TABLE IF EXISTS `Grid_settings`;
-CREATE TABLE IF NOT EXISTS `Grid_settings` (
-  `Setting` text NOT NULL,
-  `value` text NOT NULL
-) TYPE=MyISAM;
-- 
-- Dumping data for table `Grid_settings`
-- 
-INSERT INTO `Grid_settings` (`Setting`, `value`) VALUES ('highest_LLUUID', '51AEFF430000000000000000000002fd');
-- --------------------------------------------------------
-- 
-- Table structure for table `foreign_profiles`
-- 
-DROP TABLE IF EXISTS `foreign_profiles`;
-CREATE TABLE IF NOT EXISTS `foreign_profiles` (
-  `userprofile_LLUUID` varchar(32) NOT NULL default '',
-  `foreigngrid` text NOT NULL,
-  `profile_firstname` text NOT NULL,
-  `profile_lastname` text NOT NULL,
-  `profile_passwdmd5` text NOT NULL,
-  `homesim_ip` text NOT NULL,
-  `homesim_port` int(11) NOT NULL default '0',
-  `homeasset_url` text NOT NULL,
-  `homeuser_url` text NOT NULL,
-  `look_at` text NOT NULL,
-  `region_handle` text NOT NULL,
-  `position` text NOT NULL,
-  PRIMARY KEY  (`userprofile_LLUUID`)
-) TYPE=MyISAM;
-- 
-- Dumping data for table `foreign_profiles`
-- 
-- --------------------------------------------------------
-- 
-- Table structure for table `local_user_profiles`
-- 
-DROP TABLE IF EXISTS `local_user_profiles`;
-CREATE TABLE IF NOT EXISTS `local_user_profiles` (
-  `userprofile_LLUUID` varchar(32) NOT NULL default '',
-  `profile_firstname` text NOT NULL,
-  `profile_lastname` text NOT NULL,
-  `profile_passwdmd5` text NOT NULL,
-  `homesim_ip` text NOT NULL,
-  `homesim_port` int(11) NOT NULL default '0',
-  `homeasset_url` text NOT NULL,
-  `look_at` text NOT NULL,
-  `region_handle` text NOT NULL,
-  `position` text NOT NULL,
-  PRIMARY KEY  (`userprofile_LLUUID`)
-) TYPE=MyISAM;
-- 
-- Dumping data for table `local_user_profiles`
-- 
-INSERT INTO `local_user_profiles` (`userprofile_LLUUID`, `profile_firstname`, `profile_lastname`, `profile_passwdmd5`, `homesim_ip`, `homesim_port`, `homeasset_url`, `look_at`, `region_handle`, `position`) VALUES ('51AEFF43000000000000000000000100', 'Test', 'User', '$1$098f6bcd4621d373cade4e832627b4f6', '127.0.0.1', 1000, 'http://dummyassetserver.net/', 'r-0.57343, r-0.819255,r0', 'r255232,254976', 'r41.6589, r100.8374, r22.5072');
-- --------------------------------------------------------
-- 
-- Table structure for table `region_profiles`
-- 
-DROP TABLE IF EXISTS `region_profiles`;
-CREATE TABLE IF NOT EXISTS `region_profiles` (
-  `RegionID` varchar(32) NOT NULL default '',
-  `Name` text NOT NULL,
-  `GridLocX` bigint(20) NOT NULL default '0',
-  `GridLocY` bigint(20) NOT NULL default '0',
-  `region_handle` text NOT NULL,
-  `ip_addr` text NOT NULL,
-  `port` text NOT NULL,
-  PRIMARY KEY  (`RegionID`)
-) TYPE=MyISAM;
-- 
-- Dumping data for table `region_profiles`
-- 
-INSERT INTO `region_profiles` (`RegionID`, `Name`, `GridLocX`, `GridLocY`, `region_handle`, `ip_addr`, `port`) VALUES ('51AEFF43000000000000000000000200', 'Test sandbox', 997, 996, 'r255232,254976', '127.0.0.1', '1000');
-- --------------------------------------------------------
-- 
-- Table structure for table `sessions`
-- 
-DROP TABLE IF EXISTS `sessions`;
-CREATE TABLE IF NOT EXISTS `sessions` (
-  `session_id` varchar(32) NOT NULL default '',
-  `secure_session_id` text NOT NULL,
-  `agent_id` text NOT NULL,
-  `session_start` datetime NOT NULL default '0000-00-00 00:00:00',
-  `session_end` datetime NOT NULL default '0000-00-00 00:00:00',
-  `session_active` tinyint(4) NOT NULL default '0',
-  `current_location` text NOT NULL,
-  `remote_ip` text NOT NULL,
-  `circuit_code` int(11) NOT NULL default '0',
-  PRIMARY KEY  (`session_id`)
-) TYPE=MyISAM;
-- 
-- Dumping data for table `sessions`
-- 
-INSERT INTO `sessions` (`session_id`, `secure_session_id`, `agent_id`, `session_start`, `session_end`, `session_active`, `current_location`, `remote_ip`, `circuit_code`) VALUES ('51AEFF430000000000000000000002fc', '51AEFF430000000000000000000002fd', '51AEFF43000000000000000000000100', '2007-02-16 21:13:19', '0000-00-00 00:00:00', 1, 'r255232,254976', '81.174.255.70', 0);
diff --git a/ogs/OGS-UserServer.sln b/OGS/OGS.sln
index 6c98af1..20eb03a 100644
--- a/ogs/OGS-UserServer.sln
+++ b/OGS/OGS.sln
@@ -3,9 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual C# Express 2005
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OGS-UserServer", "userserver\src\OGS-UserServer.csproj", "{D45B6E48-5668-478D-B9CB-6D46E665FACF}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OGS-GridServer", "gridserver\src\OGS-GridServer.csproj", "{FE50A574-C8ED-433B-95F0-213A5EED2AB2}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerConsole", "ServerConsole\ServerConsole.csproj", "{7667E6E2-F227-41A2-B1B2-315613E1BAFC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OGS-GridServer", "gridserver\src\OGS-GridServer.csproj", "{FE50A574-C8ED-433B-95F0-213A5EED2AB2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "..\OpenSim.FrameWork\OpenSim.Framework.csproj", "{2E46A825-3168-492F-93BC-637126B5B72B}"
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -17,14 +19,18 @@ Global
                {D45B6E48-5668-478D-B9CB-6D46E665FACF}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {D45B6E48-5668-478D-B9CB-6D46E665FACF}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {D45B6E48-5668-478D-B9CB-6D46E665FACF}.Release|Any CPU.Build.0 = Release|Any CPU
-                {7667E6E2-F227-41A2-B1B2-315613E1BAFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {7667E6E2-F227-41A2-B1B2-315613E1BAFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {7667E6E2-F227-41A2-B1B2-315613E1BAFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {7667E6E2-F227-41A2-B1B2-315613E1BAFC}.Release|Any CPU.Build.0 = Release|Any CPU
                {FE50A574-C8ED-433B-95F0-213A5EED2AB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {FE50A574-C8ED-433B-95F0-213A5EED2AB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {FE50A574-C8ED-433B-95F0-213A5EED2AB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {FE50A574-C8ED-433B-95F0-213A5EED2AB2}.Release|Any CPU.Build.0 = Release|Any CPU
+                {7667E6E2-F227-41A2-B1B2-315613E1BAFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {7667E6E2-F227-41A2-B1B2-315613E1BAFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {7667E6E2-F227-41A2-B1B2-315613E1BAFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {7667E6E2-F227-41A2-B1B2-315613E1BAFC}.Release|Any CPU.Build.0 = Release|Any CPU
+                {2E46A825-3168-492F-93BC-637126B5B72B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {2E46A825-3168-492F-93BC-637126B5B72B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {2E46A825-3168-492F-93BC-637126B5B72B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {2E46A825-3168-492F-93BC-637126B5B72B}.Release|Any CPU.Build.0 = Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
diff --git a/ogs/ServerConsole/Properties/AssemblyInfo.cs b/OGS/ServerConsole/Properties/AssemblyInfo.cs
index 0028e2a..0028e2a 100644
--- a/ogs/ServerConsole/Properties/AssemblyInfo.cs
+++ b/OGS/ServerConsole/Properties/AssemblyInfo.cs
diff --git a/ogs/ServerConsole/ServerConsole.cs b/OGS/ServerConsole/ServerConsole.cs
index d50a7e2..d50a7e2 100644
--- a/ogs/ServerConsole/ServerConsole.cs
+++ b/OGS/ServerConsole/ServerConsole.cs
diff --git a/ogs/ServerConsole/ServerConsole.csproj b/OGS/ServerConsole/ServerConsole.csproj
index 7f3005e..d23ca52 100644
--- a/ogs/ServerConsole/ServerConsole.csproj
+++ b/OGS/ServerConsole/ServerConsole.csproj
@@ -9,8 +9,6 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>ServerConsole</RootNamespace>
    <AssemblyName>ServerConsole</AssemblyName>
-    <StartupObject>
-    </StartupObject>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@@ -39,11 +37,4 @@
    <Compile Include="ServerConsole.cs" />
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
 \ No newline at end of file
diff --git a/ogs/ServerConsole/default.build b/OGS/ServerConsole/default.build
index 64a4f04..64a4f04 100644
--- a/ogs/ServerConsole/default.build
+++ b/OGS/ServerConsole/default.build
diff --git a/ogs/common/VersionInfo/VersionInfo.cs b/OGS/common/VersionInfo/VersionInfo.cs
index 9763e62..9763e62 100644
--- a/ogs/common/VersionInfo/VersionInfo.cs
+++ b/OGS/common/VersionInfo/VersionInfo.cs
diff --git a/OGS/common/bin/ServerConsole.dll b/OGS/common/bin/ServerConsole.dll
new file mode 100644
index 0000000..842e0d0
--- /dev/null
+++ b/OGS/common/bin/ServerConsole.dll
Binary files differ
diff --git a/OGS/common/bin/ServerConsole.pdb b/OGS/common/bin/ServerConsole.pdb
new file mode 100644
index 0000000..b0f3b63
--- /dev/null
+++ b/OGS/common/bin/ServerConsole.pdb
Binary files differ
diff --git a/ogs/common/bin/libsecondlife.dll b/OGS/common/bin/libsecondlife.dll
index 89d692a..89d692a 100755..100644
--- a/ogs/common/bin/libsecondlife.dll
+++ b/OGS/common/bin/libsecondlife.dll
Binary files differ
diff --git a/ogs/common/src/OGS-Console.cs b/OGS/common/src/OGS-Console.cs
index c35c75c..c35c75c 100644
--- a/ogs/common/src/OGS-Console.cs
+++ b/OGS/common/src/OGS-Console.cs
diff --git a/ogs/common/src/VersionInfo.cs.template b/OGS/common/src/VersionInfo.cs.template
index 8f73b4b..8f73b4b 100644
--- a/ogs/common/src/VersionInfo.cs.template
+++ b/OGS/common/src/VersionInfo.cs.template
diff --git a/ogs/gridserver/default.build b/OGS/gridserver/default.build
index b113b83..b113b83 100644
--- a/ogs/gridserver/default.build
+++ b/OGS/gridserver/default.build
diff --git a/ogs/gridserver/src/ConsoleCmds.cs b/OGS/gridserver/src/ConsoleCmds.cs
index 82a2279..82a2279 100644
--- a/ogs/gridserver/src/ConsoleCmds.cs
+++ b/OGS/gridserver/src/ConsoleCmds.cs
diff --git a/ogs/gridserver/src/GridHttp.cs b/OGS/gridserver/src/GridHttp.cs
index 833a8ac..496a3bc 100644
--- a/ogs/gridserver/src/GridHttp.cs
+++ b/OGS/gridserver/src/GridHttp.cs
@@ -38,6 +38,7 @@ using System.Collections;
 using System.Collections.Generic;
 using libsecondlife;
 using ServerConsole;
+using OpenSim.Framework.Sims;
 namespace OpenGridServices
 {
@@ -73,7 +74,7 @@ namespace OpenGridServices
                        switch(request.MethodName) {
                                case "get_sim_info":
                                        ulong req_handle=(ulong)Convert.ToInt64(requestData["region_handle"]);
-                                        SimProfile TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByHandle(req_handle);
+                                        SimProfileBase TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByHandle(req_handle);
                                        string RecvKey="";
                                        string caller=(string)requestData["caller"];
                                        switch(caller) {
diff --git a/ogs/gridserver/src/Main.cs b/OGS/gridserver/src/Main.cs
index d29a1ae..d29a1ae 100644
--- a/ogs/gridserver/src/Main.cs
+++ b/OGS/gridserver/src/Main.cs
diff --git a/ogs/gridserver/src/OGS-GridServer.csproj b/OGS/gridserver/src/OGS-GridServer.csproj
index d984e9a..b957d40 100644
--- a/ogs/gridserver/src/OGS-GridServer.csproj
+++ b/OGS/gridserver/src/OGS-GridServer.csproj
@@ -40,9 +40,6 @@
    <Compile Include="..\..\common\src\OGS-Console.cs">
      <Link>OGS-Console.cs</Link>
    </Compile>
-    <Compile Include="..\..\common\src\Util.cs">
-      <Link>Util.cs</Link>
-    </Compile>
    <Compile Include="..\..\common\VersionInfo\VersionInfo.cs">
      <Link>VersionInfo.cs</Link>
    </Compile>
@@ -53,17 +50,14 @@
    <Compile Include="SimProfiles.cs" />
  </ItemGroup>
  <ItemGroup>
+    <ProjectReference Include="..\..\..\OpenSim.FrameWork\OpenSim.Framework.csproj">
+      <Project>{2E46A825-3168-492F-93BC-637126B5B72B}</Project>
+      <Name>OpenSim.Framework</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\ServerConsole\ServerConsole.csproj">
      <Project>{7667E6E2-F227-41A2-B1B2-315613E1BAFC}</Project>
      <Name>ServerConsole</Name>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
 \ No newline at end of file
diff --git a/ogs/gridserver/src/Properties/AssemblyInfo.cs b/OGS/gridserver/src/Properties/AssemblyInfo.cs
index 8471e6b..8471e6b 100644
--- a/ogs/gridserver/src/Properties/AssemblyInfo.cs
+++ b/OGS/gridserver/src/Properties/AssemblyInfo.cs
diff --git a/ogs/gridserver/src/SimProfiles.cs b/OGS/gridserver/src/SimProfiles.cs
index 91a92ea..6db8331 100644
--- a/ogs/gridserver/src/SimProfiles.cs
+++ b/OGS/gridserver/src/SimProfiles.cs
@@ -33,6 +33,8 @@ using System.Collections;
 using System.Collections.Generic;
 using libsecondlife;
 using ServerConsole;
+using OpenSim.Framework.Utilities;
+using OpenSim.Framework.Sims;
 namespace OpenGridServices
 {
@@ -40,7 +42,7 @@ namespace OpenGridServices
        /// </summary>
        public class SimProfileManager {
        
-                public Dictionary<LLUUID, SimProfile> SimProfiles = new Dictionary<LLUUID, SimProfile>();
+                public Dictionary<LLUUID, SimProfileBase> SimProfiles = new Dictionary<LLUUID, SimProfileBase>();
                public SimProfileManager() {
                }
@@ -49,19 +51,19 @@ namespace OpenGridServices
                        // TODO: need to load from database
                }
-                public SimProfile GetProfileByHandle(ulong reqhandle) {
+                public SimProfileBase GetProfileByHandle(ulong reqhandle) {
                        foreach (libsecondlife.LLUUID UUID in SimProfiles.Keys) {
                                if(SimProfiles[UUID].regionhandle==reqhandle) return SimProfiles[UUID];
                        }
                        return null;
                }
-                public SimProfile GetProfileByLLUUID(LLUUID ProfileLLUUID) {
+                public SimProfileBase GetProfileByLLUUID(LLUUID ProfileLLUUID) {
                        return SimProfiles[ProfileLLUUID];
                }
        
                public bool AuthenticateSim(LLUUID RegionUUID, uint regionhandle, string simrecvkey) {
-                        SimProfile TheSim=GetProfileByHandle(regionhandle);
+                        SimProfileBase TheSim=GetProfileByHandle(regionhandle);
                        if(TheSim != null) 
                        if(TheSim.recvkey==simrecvkey) {
                                return true;
@@ -71,8 +73,8 @@ namespace OpenGridServices
                        
                }
-                public SimProfile CreateNewProfile(string regionname, string caps_url, string sim_ip, uint sim_port, uint RegionLocX, uint RegionLocY, string sendkey, string recvkey) {
+                public SimProfileBase CreateNewProfile(string regionname, string caps_url, string sim_ip, uint sim_port, uint RegionLocX, uint RegionLocY, string sendkey, string recvkey) {
-                        SimProfile newprofile = new SimProfile();
+                        SimProfileBase newprofile = new SimProfileBase();
                        newprofile.regionname=regionname;
                        newprofile.sim_ip=sim_ip;
                        newprofile.sim_port=sim_port;
@@ -89,7 +91,8 @@ namespace OpenGridServices
        }
-        public class SimProfile {
+    /*  is in OpenSim.Framework
+        public class SimProfileBase {
                public LLUUID UUID;
                public ulong regionhandle;
                public string regionname;
@@ -102,10 +105,10 @@ namespace OpenGridServices
                public string recvkey;
                
        
-                public SimProfile() {
+                public SimProfileBase() {
                }
        
        
-        }
+        }*/
 }
diff --git a/ogs/userserver/src/ConsoleCmds.cs b/OGS/userserver/src/ConsoleCmds.cs
index f2568fc..f2568fc 100644
--- a/ogs/userserver/src/ConsoleCmds.cs
+++ b/OGS/userserver/src/ConsoleCmds.cs
diff --git a/ogs/userserver/src/Main.cs b/OGS/userserver/src/Main.cs
index 40ef916..7e5308e 100644
--- a/ogs/userserver/src/Main.cs
+++ b/OGS/userserver/src/Main.cs
@@ -33,6 +33,9 @@ using System.Collections.Generic;
 using System.Text;
 using libsecondlife;
 using ServerConsole;
+using OpenSim.Framework.User;
+using OpenSim.Framework.Sims;
+using OpenSim.Framework.Inventory;
 namespace OpenGridServices
 {
@@ -73,16 +76,17 @@ namespace OpenGridServices
                public void Startup() {
                        ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Please press enter to retain default settings");
-                        this.GridURL=ServerConsole.MainConsole.Instance.CmdPrompt("Grid URL: ");
+            this.GridURL=ServerConsole.MainConsole.Instance.CmdPrompt("Grid URL: ");
                        this.GridSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to send to grid: ");
                        this.GridRecvKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to expect from grid: ");
                
                        this.DefaultStartupMsg=ServerConsole.MainConsole.Instance.CmdPrompt("Default startup message for clients [Welcome to OGS!] :","Welcome to OGS!");
+           
                        ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Creating user profile manager");
                        _profilemanager = new UserProfileManager();
                        _profilemanager.InitUserProfiles();
-        
+            _profilemanager.SetKeys(GridSendKey, GridRecvKey, GridURL, DefaultStartupMsg);
                
                        string tempfirstname;
                        string templastname;
diff --git a/ogs/userserver/src/OGS-UserServer.csproj b/OGS/userserver/src/OGS-UserServer.csproj
index f6737c8..f4fa8b6 100644
--- a/ogs/userserver/src/OGS-UserServer.csproj
+++ b/OGS/userserver/src/OGS-UserServer.csproj
@@ -48,21 +48,16 @@
    <Compile Include="Main.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="UserHttp.cs" />
-    <Compile Include="UserProfiles.cs" />
-    <Compile Include="Util.cs" />
  </ItemGroup>
  <ItemGroup>
+    <ProjectReference Include="..\..\..\OpenSim.FrameWork\OpenSim.Framework.csproj">
+      <Project>{2E46A825-3168-492F-93BC-637126B5B72B}</Project>
+      <Name>OpenSim.Framework</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\ServerConsole\ServerConsole.csproj">
      <Project>{7667E6E2-F227-41A2-B1B2-315613E1BAFC}</Project>
      <Name>ServerConsole</Name>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
 \ No newline at end of file
diff --git a/ogs/userserver/src/OGS-UserServer.csproj.user b/OGS/userserver/src/OGS-UserServer.csproj.user
index 9c0b2d9..aa75a3d 100644
--- a/ogs/userserver/src/OGS-UserServer.csproj.user
+++ b/OGS/userserver/src/OGS-UserServer.csproj.user
@@ -1,14 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <PublishUrlHistory>publish\</PublishUrlHistory>
-    <InstallUrlHistory>
-    </InstallUrlHistory>
-    <SupportUrlHistory>
-    </SupportUrlHistory>
-    <UpdateUrlHistory>
-    </UpdateUrlHistory>
-    <BootstrapperUrlHistory>
-    </BootstrapperUrlHistory>
    <ApplicationRevision>0</ApplicationRevision>
    <FallbackCulture>en-US</FallbackCulture>
    <VerifyUploadedFiles>false</VerifyUploadedFiles>
diff --git a/ogs/userserver/src/Properties/AssemblyInfo.cs b/OGS/userserver/src/Properties/AssemblyInfo.cs
index 5d5ce8d..5d5ce8d 100644
--- a/ogs/userserver/src/Properties/AssemblyInfo.cs
+++ b/OGS/userserver/src/Properties/AssemblyInfo.cs
diff --git a/OGS/userserver/src/UserHttp.cs b/OGS/userserver/src/UserHttp.cs
new file mode 100644
index 0000000..ce3cfcd
--- /dev/null
+++ b/OGS/userserver/src/UserHttp.cs
@@ -0,0 +1,146 @@
+/*
+Copyright (c) OpenGrid project, http://osgrid.org/
+* All rights reserved.
+*
+* 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 <organization> 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 <copyright holder> ``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 <copyright holder> 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.Text;
+using Nwc.XmlRpc;
+using System.Threading;
+using System.Text.RegularExpressions;
+using System.Net;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using libsecondlife;
+using ServerConsole;
+using OpenSim.Framework.User;
+using OpenSim.Framework.Sims;
+using OpenSim.Framework.Inventory;
+namespace OpenGridServices
+{
+        public class UserHTTPServer {
+                public Thread HTTPD;
+                public HttpListener Listener;
+        
+                public UserHTTPServer() {
+                        ServerConsole.MainConsole.Instance.WriteLine("Starting up HTTP Server");
+                        HTTPD = new Thread(new ThreadStart(StartHTTP));
+                        HTTPD.Start();
+                }
+                public void StartHTTP() {
+                        ServerConsole.MainConsole.Instance.WriteLine("UserHttp.cs:StartHTTP() - Spawned main thread OK");
+                        Listener = new HttpListener();
+                        Listener.Prefixes.Add("http://+:8002/userserver/");
+                        Listener.Prefixes.Add("http://+:8002/usersessions/");
+                        Listener.Start();
+                        HttpListenerContext context;
+                        while(true) {
+                                context = Listener.GetContext();
+                                ThreadPool.QueueUserWorkItem(new WaitCallback(HandleRequest), context);
+                        }
+                }
+                static string ParseXMLRPC(string requestBody) {
+            return OpenGridServices.OpenUser_Main.userserver._profilemanager.ParseXMLRPC(requestBody);
+                }
+                
+                static string ParseREST(HttpListenerRequest www_req) {
+                        Console.WriteLine("INCOMING REST - " + www_req.RawUrl);
+        
+                        char[] splitter  = {'/'};
+                        string[] rest_params = www_req.RawUrl.Split(splitter);
+                        string req_type = rest_params[1];       // First part of the URL is the type of request - usersessions/userprofiles/inventory/blabla
+                        switch(req_type) {
+                                case "usersessions":
+                                        LLUUID sessionid = new LLUUID(rest_params[2]);  // get usersessions/sessionid
+                                        if(www_req.HttpMethod=="DELETE") {
+                                                foreach (libsecondlife.LLUUID UUID in OpenUser_Main.userserver._profilemanager.UserProfiles.Keys) {
+                                                        if(OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].CurrentSessionID==sessionid) {
+                                                                OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].CurrentSessionID=null;
+                                                                OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].CurrentSecureSessionID=null;
+                                                                OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].Circuits.Clear();
+                                                        }
+                                                }
+                                        }
+                                        return "OK";
+                                break;
+                        }
+                        return "";
+                }
+                static void HandleRequest(Object  stateinfo) {
+                        HttpListenerContext context=(HttpListenerContext)stateinfo;
+                
+                        HttpListenerRequest request = context.Request;
+                        HttpListenerResponse response = context.Response;
+                        response.KeepAlive=false;
+                        response.SendChunked=false;
+                        System.IO.Stream body = request.InputStream;
+                        System.Text.Encoding encoding = System.Text.Encoding.UTF8;
+                        System.IO.StreamReader reader = new System.IO.StreamReader(body, encoding);
+   
+                        string requestBody = reader.ReadToEnd();
+                        body.Close();
+                        reader.Close();
+                        string responseString="";
+                        switch(request.ContentType) {
+                                case "text/xml":
+                                        // must be XML-RPC, so pass to the XML-RPC parser
+                                        
+                                        responseString=ParseXMLRPC(requestBody);
+                                        response.AddHeader("Content-type","text/xml");  
+                                break;
+                                
+                                case "text/plaintext":
+                                        responseString=ParseREST(request);
+                                        response.AddHeader("Content-type","text/plaintext");
+                                break;
+                        }
+        
+        
+                        byte[] buffer = System.Text.Encoding.UTF8.GetBytes(responseString);
+                        System.IO.Stream output = response.OutputStream;
+                        response.SendChunked=false;
+                        response.ContentLength64=buffer.Length;
+                        output.Write(buffer,0,buffer.Length);
+                        output.Close();
+                }
+        }
+}